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

- AP costs for reloading a GL or RL by attaching an item are taken now from weapons.xml (still buggy, allows cheating)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-01-26 17:01:03 +00:00
parent b46f47cb04
commit 21c2464a43
4 changed files with 41 additions and 11 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.679" }; INT16 zVersionLabel[256] = { L"Release v1.13.684" };
#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="D:\games\Jagged Alliance 2 v1.13\ja2 v1.13.679_EN.exe" OutputFile="D:\games\Jagged Alliance 2 v1.13\ja2 v1.13.684_EN.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\" AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
Tactical/Interface Items.cpp
+11 -2
View File
@@ -4161,7 +4161,16 @@ void DeleteItemDescriptionBox( )
if (!fFound) if (!fFound)
{ {
// charge APs // charge APs
ubAPCost = AttachmentAPCost(gpItemDescObject->usAttachItem[ cnt ],gpItemDescObject->usItem); //lalien: changed to charge AP's for reloading a GL/RL
if ( Item[ gpItemDescObject->usItem ].usItemClass == IC_LAUNCHER || Item[gpItemDescObject->usItem].cannon )
{
ubAPCost = GetAPsToReload( gpItemDescObject );
}
else
{
ubAPCost = AttachmentAPCost(gpItemDescObject->usAttachItem[ cnt ],gpItemDescObject->usItem);
}
fAllFound = FALSE; fAllFound = FALSE;
break; break;
} }
@@ -4178,7 +4187,7 @@ void DeleteItemDescriptionBox( )
//Remove //Remove
DeleteVideoObjectFromIndex( guiItemDescBox ); DeleteVideoObjectFromIndex( guiItemDescBox );
DeleteVideoObjectFromIndex( guiMapItemDescBox ); DeleteVideoObjectFromIndex( guiMapItemDescBox );
DeleteVideoObjectFromIndex( guiBullet ); DeleteVideoObjectFromIndex( guiBullet );
// Delete item graphic // Delete item graphic
DeleteVideoObjectFromIndex( guiItemGraphic ); DeleteVideoObjectFromIndex( guiItemGraphic );
Tactical/Items.cpp
+28 -7
View File
@@ -2586,15 +2586,15 @@ BOOLEAN PlaceObjectAtObjectIndex( OBJECTTYPE * pSourceObj, OBJECTTYPE * pTargetO
BOOLEAN ReloadGun( SOLDIERTYPE * pSoldier, OBJECTTYPE * pGun, OBJECTTYPE * pAmmo ) BOOLEAN ReloadGun( SOLDIERTYPE * pSoldier, OBJECTTYPE * pGun, OBJECTTYPE * pAmmo )
{ {
OBJECTTYPE OldAmmo; OBJECTTYPE OldAmmo;
UINT8 ubBulletsToMove; UINT8 ubBulletsToMove;
INT8 bAPs; INT8 bAPs;
UINT16 usReloadSound; UINT16 usReloadSound;
BOOLEAN fSameAmmoType; BOOLEAN fSameAmmoType;
BOOLEAN fSameMagazineSize; BOOLEAN fSameMagazineSize;
BOOLEAN fReloadingWithStack; BOOLEAN fReloadingWithStack;
BOOLEAN fEmptyGun; BOOLEAN fEmptyGun;
INT8 bReloadType; INT8 bReloadType;
UINT16 usNewAmmoItem; UINT16 usNewAmmoItem;
if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) ) if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) )
@@ -3183,7 +3183,8 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
UINT8 ubType, ubLimit, ubAPCost; UINT8 ubType, ubLimit, ubAPCost;
INT32 iCheckResult; INT32 iCheckResult;
INT8 bAttachInfoIndex = -1, bAttachComboMerge; INT8 bAttachInfoIndex = -1, bAttachComboMerge;
BOOLEAN fValidLaunchable = FALSE; BOOLEAN fValidLaunchable = FALSE;
BOOLEAN IsAGLorRL = FALSE;
if ( pTargetObj->ubNumberOfObjects > 1 ) if ( pTargetObj->ubNumberOfObjects > 1 )
@@ -3227,11 +3228,27 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
} }
//lalien: added to make a GL/RL work when reloaded manually //lalien: added to make a GL/RL work when reloaded manually
// the AP costs for reloading GL/RL will be taken from weapons.xml ( wrong place!!! the AP's are deducted in DeleteItemDescriptionBox() )
if (bAttachPos != ITEM_NOT_FOUND) if (bAttachPos != ITEM_NOT_FOUND)
{ {
if ( Item[ pTargetObj->usItem ].usItemClass == IC_LAUNCHER || Item[pTargetObj->usItem].cannon ) if ( Item[ pTargetObj->usItem ].usItemClass == IC_LAUNCHER || Item[pTargetObj->usItem].cannon )
{ {
pTargetObj->usGunAmmoItem = pAttachment->usItem; //if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) )
//{
// INT8 bAPs = GetAPsToReloadGunWithAmmo( pTargetObj, pAttachment );
//
// if ( !EnoughPoints( pSoldier, bAPs, 0,TRUE ) )
// {
// return( FALSE );
// }
// else
// {
// DeductPoints( pSoldier, bAPs, 0 );
// IsAGLorRL = TRUE;
// }
//}
pTargetObj->usGunAmmoItem = pAttachment->usItem;
} }
} }
@@ -3353,7 +3370,11 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
return( FALSE ); return( FALSE );
} }
DeductPoints( pSoldier, ubAPCost, 0 ); //lalien: don't charge AP's for reloading a GL/RL ( wrong place!!! the AP's are deducted in DeleteItemDescriptionBox() )
//if ( IsAGLorRL == FALSE )
//{
DeductPoints( pSoldier, ubAPCost, 0 );
//}
} }
switch( ubType ) switch( ubType )