diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 7f7e6a75e..492ac1315 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -3204,8 +3204,8 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP OBJECTTYPE TempObj = {0}; // find an attachment position... - // second half of this 'if' is for attaching GL grenades to a gun - if ( fValidLaunchable || Item[pAttachment->usItem].glgrenade ) + // second half of this 'if' is for attaching GL grenades to a gun w/attached GL + if ( fValidLaunchable || (Item[pAttachment->usItem].glgrenade && FindAttachmentByClass(pTargetObj, IC_LAUNCHER) != NO_SLOT ) ) { // try replacing if possible bAttachPos = FindAttachmentByClass( pTargetObj, Item[ pAttachment->usItem ].usItemClass );