From 682d33da8c98b6ceab2bb12fb949074938c02d80 Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Wed, 4 Apr 2007 02:38:33 +0000 Subject: [PATCH] -minor fix to allow different types of GL grenades to be attached to the grenade panel and the ALICE pack git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@830 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Items.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 );