1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Possible fix for the intermittent sector inventory right-click issue.

Browse Source 
Fixed the display AP cost for shooting (when you also have to change facing and/or ready a weapon) so that it correctly matches the APs that are really charged.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2008-08-08 23:26:20 +00:00
parent a1a00fbf59
commit 382fff0437
4 changed files with 87 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.cpp
+20 -6
View File
@@ -197,6 +197,8 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, INT16 sGridNo, INT8 bLevel, UINT16 usHa
BOOLEAN fAddingRaiseGunCost = FALSE;
LEVELNODE *pIntNode;
STRUCTURE *pStructure;
UINT16 usRaiseGunCost = 0;
UINT16 usTurningCost = 0;
// Remove any previous actions
@@ -405,13 +407,19 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, INT16 sGridNo, INT8 bLevel, UINT16 usHa
GetAPChargeForShootOrStabWRTGunRaises( pSoldier, sTargetGridNo, TRUE, &fAddingTurningCost, &fAddingRaiseGunCost );
usTurningCost = CalculateTurningCost(pSoldier, usHandItem, fAddingTurningCost);
usRaiseGunCost = CalculateRaiseGunCost(pSoldier, fAddingRaiseGunCost);
// If we are standing and are asked to turn AND raise gun, ignore raise gun...
if ( gAnimControl[ pSoldier->usAnimState ].ubHeight == ANIM_STAND )
//CHRISL: Actually, the display value is based on the higher of turn and raise gun so we should do the same
if ( gAnimControl[ pSoldier->usAnimState ].ubHeight != ANIM_PRONE )
{
if ( fAddingRaiseGunCost )
if ( fAddingTurningCost && fAddingRaiseGunCost )
{
pSoldier->flags.fDontChargeTurningAPs = TRUE;
if(usRaiseGunCost > usTurningCost)
pSoldier->flags.fDontChargeTurningAPs = TRUE;
else
pSoldier->flags.fDontChargeReadyAPs = TRUE;
}
}
/*else
@@ -1329,13 +1337,19 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, INT16 sGridNo, INT8 bLevel, UINT16 usHa
else if ( Item[usHandItem].grenadelauncher )//usHandItem == GLAUNCHER || usHandItem == UNDER_GLAUNCHER )
{
GetAPChargeForShootOrStabWRTGunRaises( pSoldier, sTargetGridNo, TRUE, &fAddingTurningCost, &fAddingRaiseGunCost );
usTurningCost = CalculateTurningCost(pSoldier, usHandItem, fAddingTurningCost);
usRaiseGunCost = CalculateRaiseGunCost(pSoldier, fAddingRaiseGunCost);
// If we are standing and are asked to turn AND raise gun, ignore raise gun...
if ( gAnimControl[ pSoldier->usAnimState ].ubHeight == ANIM_STAND )
//CHRISL: Actually, the display value is based on the higher of turn and raise gun so we should do the same
if ( gAnimControl[ pSoldier->usAnimState ].ubHeight != ANIM_PRONE )
{
if ( fAddingRaiseGunCost )
if ( fAddingTurningCost && fAddingRaiseGunCost )
{
pSoldier->flags.fDontChargeTurningAPs = TRUE;
if(usRaiseGunCost > usTurningCost)
pSoldier->flags.fDontChargeTurningAPs = TRUE;
else
pSoldier->flags.fDontChargeReadyAPs = TRUE;
}
}
/*else