-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
This commit is contained in:
MaddMugsy
2007-04-04 02:38:33 +00:00
parent 1baf9b0bd1
commit 682d33da8c
+2 -2
View File
@@ -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 );