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

- bug fix: when merging an item to a stack of items all of them were converted to a new item

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-01-17 19:42:32 +00:00
parent a6a2307c56
commit e4d8bfa058
3 changed files with 14 additions and 2 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.661" }; INT16 zVersionLabel[256] = { L"Release v1.13.662" };
#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.661_EN.exe" OutputFile="D:\games\Jagged Alliance 2 v1.13\ja2 v1.13.662_EN.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\" AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
Tactical/Items.cpp
+12
View File
@@ -3131,6 +3131,8 @@ INT8 GetAttachmentComboMerge( OBJECTTYPE * pObj )
return( -1 ); return( -1 );
} }
void PerformAttachmentComboMerge( OBJECTTYPE * pObj, INT8 bAttachmentComboMerge ) void PerformAttachmentComboMerge( OBJECTTYPE * pObj, INT8 bAttachmentComboMerge )
{ {
INT8 bAttachLoop, bAttachPos; INT8 bAttachLoop, bAttachPos;
@@ -3165,10 +3167,14 @@ void PerformAttachmentComboMerge( OBJECTTYPE * pObj, INT8 bAttachmentComboMerge
pObj->usItem = AttachmentComboMerge[ bAttachmentComboMerge ].usResult; pObj->usItem = AttachmentComboMerge[ bAttachmentComboMerge ].usResult;
pObj->bStatus[ 0 ] = (INT8) (uiStatusTotal / bNumStatusContributors ); pObj->bStatus[ 0 ] = (INT8) (uiStatusTotal / bNumStatusContributors );
} }
BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYPE * pAttachment ) BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYPE * pAttachment )
{ {
return AttachObject( pSoldier, pTargetObj, pAttachment, TRUE ); return AttachObject( pSoldier, pTargetObj, pAttachment, TRUE );
} }
BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYPE * pAttachment, BOOLEAN playSound ) BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYPE * pAttachment, BOOLEAN playSound )
{ {
INT8 bAttachPos, bSecondAttachPos;//, bAbility, bSuccess; INT8 bAttachPos, bSecondAttachPos;//, bAbility, bSuccess;
@@ -3179,6 +3185,12 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
INT8 bAttachInfoIndex = -1, bAttachComboMerge; INT8 bAttachInfoIndex = -1, bAttachComboMerge;
BOOLEAN fValidLaunchable = FALSE; BOOLEAN fValidLaunchable = FALSE;
if ( pTargetObj->ubNumberOfObjects > 1 )
{
return( FALSE );
}
fValidLaunchable = ValidLaunchable( pAttachment->usItem, pTargetObj->usItem ); fValidLaunchable = ValidLaunchable( pAttachment->usItem, pTargetObj->usItem );
if ( fValidLaunchable || ValidItemAttachment( pTargetObj, pAttachment->usItem, TRUE ) ) if ( fValidLaunchable || ValidItemAttachment( pTargetObj, pAttachment->usItem, TRUE ) )