1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bug fix: no explosion if the rocket launcher was reloaded manually (with attaching a rocket/grenade)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-01-24 12:07:39 +00:00
parent 99b30d0c18
commit b46f47cb04
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.665" }; INT16 zVersionLabel[256] = { L"Release v1.13.679" };
#endif #endif
JA2.vcproj
+1 -1
View File
@@ -546,7 +546,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib" AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2 v1.13.665_EN.exe" OutputFile="D:\games\Jagged Alliance 2 v1.13\ja2 v1.13.679_EN.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\" AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
Tactical/Items.cpp
+12 -2
View File
@@ -3209,7 +3209,7 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
if ( pAttachment->ubNumberOfObjects > 1 ) if ( pAttachment->ubNumberOfObjects > 1 )
{ {
return( FALSE ); return( FALSE );
} }
} }
else 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) if (bAttachPos == ITEM_NOT_FOUND)
{ {
return( FALSE ); return( FALSE );
@@ -3298,7 +3308,7 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
pTargetObj->usAttachItem[bSecondAttachPos] = pAttachment->usAttachItem[0]; pTargetObj->usAttachItem[bSecondAttachPos] = pAttachment->usAttachItem[0];
pTargetObj->bAttachStatus[bSecondAttachPos] = pAttachment->bAttachStatus[0]; pTargetObj->bAttachStatus[bSecondAttachPos] = pAttachment->bAttachStatus[0];
pAttachment->usAttachItem[0] = NOTHING; pAttachment->usAttachItem[0] = NOTHING;
pAttachment->bAttachStatus[0] = 0; pAttachment->bAttachStatus[0] = 0;
} }
} }
} }