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

- wrapped fortify ap costs

Browse Source 
- Fix: drug effects weren't adjusted in turnbased

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-04-01 17:45:47 +00:00
parent 1aea5efd1b
commit 8137c04207
5 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+7 -7
View File
@@ -7356,7 +7356,7 @@ void SOLDIERTYPE::EVENT_BeginMercTurn( BOOLEAN fFromRealTime, INT32 iRealTimeCou
this->ResetExtraStats();
// ATE: Add decay effect sfor drugs...
if ( fFromRealTime ) //&& iRealTimeCounter % 300 )
//if ( fFromRealTime ) //&& iRealTimeCounter % 300 )
{
HandleEndTurnDrugAdjustments( this );
}
@@ -15508,13 +15508,13 @@ void SOLDIERTYPE::StartMultiTurnAction(UINT8 usActionType)
switch( usMultiTurnAction )
{
case MTA_FORTIFY:
bOverTurnAPS = APBPConstants[AP_FORTIFICATION];
bOverTurnAPS = GetAPsToBuildFortification( this );
break;
case MTA_REMOVE_FORTIFY:
bOverTurnAPS = APBPConstants[AP_REMOVE_FORTIFICATION];
bOverTurnAPS = GetAPsToRemoveFortification( this );
break;
case MTA_FILL_SANDBAG:
bOverTurnAPS = APBPConstants[AP_FILL_SANDBAG];
bOverTurnAPS = GetAPsToFillSandbag( this );
break;
}
@@ -15576,7 +15576,7 @@ BOOLEAN SOLDIERTYPE::UpdateMultiTurnAction()
{
case MTA_FORTIFY:
{
entireapcost = APBPConstants[AP_FORTIFICATION];
entireapcost = GetAPsToBuildFortification( this );
entirebpcost = APBPConstants[BP_FORTIFICATION];
if ( !IsFortificationPossibleAtGridNo( this->sMTActionGridNo ) )
@@ -15587,7 +15587,7 @@ BOOLEAN SOLDIERTYPE::UpdateMultiTurnAction()
break;
case MTA_REMOVE_FORTIFY:
{
entireapcost = APBPConstants[AP_REMOVE_FORTIFICATION];
entireapcost = GetAPsToRemoveFortification( this );
entirebpcost = APBPConstants[BP_REMOVE_FORTIFICATION];
if ( !HasItemFlag(this->inv[ HANDPOS ].usItem, (SHOVEL)) )
@@ -15597,7 +15597,7 @@ BOOLEAN SOLDIERTYPE::UpdateMultiTurnAction()
case MTA_FILL_SANDBAG:
{
entireapcost = APBPConstants[AP_FILL_SANDBAG];
entireapcost = GetAPsToFillSandbag( this );
entirebpcost = APBPConstants[BP_FILL_SANDBAG];
if ( !HasItemFlag(this->inv[ HANDPOS ].usItem, EMPTY_SANDBAG) )