diff --git a/GameVersion.cpp b/GameVersion.cpp index 7c0434a8..fc43b249 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.665" }; + INT16 zVersionLabel[256] = { L"Release v1.13.679" }; #endif diff --git a/JA2.vcproj b/JA2.vcproj index 512a4f8b..09db4861 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -546,7 +546,7 @@ ubNumberOfObjects > 1 ) { return( FALSE ); - } + } } else { @@ -3226,6 +3226,16 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP } } + //lalien: added to make a GL/RL work when reloaded manually + if (bAttachPos != ITEM_NOT_FOUND) + { + if ( Item[ pTargetObj->usItem ].usItemClass == IC_LAUNCHER || Item[pTargetObj->usItem].cannon ) + { + pTargetObj->usGunAmmoItem = pAttachment->usItem; + } + } + + if (bAttachPos == ITEM_NOT_FOUND) { return( FALSE ); @@ -3298,7 +3308,7 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP pTargetObj->usAttachItem[bSecondAttachPos] = pAttachment->usAttachItem[0]; pTargetObj->bAttachStatus[bSecondAttachPos] = pAttachment->bAttachStatus[0]; pAttachment->usAttachItem[0] = NOTHING; - pAttachment->bAttachStatus[0] = 0; + pAttachment->bAttachStatus[0] = 0; } } }