mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -40,8 +40,8 @@ void StrategicTurnsNewGame( )
|
||||
|
||||
void SyncStrategicTurnTimes( )
|
||||
{
|
||||
guiLastStrategicTime = GetWorldTotalSeconds( );
|
||||
guiLastTacticalRealTime = GetJA2Clock( );
|
||||
guiLastStrategicTime = GetWorldTotalSeconds( );
|
||||
guiLastTacticalRealTime = GetJA2Clock( );
|
||||
}
|
||||
|
||||
void HandleStrategicTurn( )
|
||||
@@ -90,7 +90,7 @@ void HandleStrategicTurn( )
|
||||
// OK, if we have compressed time...., adjust our check value to be faster....
|
||||
if( giTimeCompressSpeeds[ giTimeCompressMode ] > 0 )
|
||||
{
|
||||
uiCheckTime = NUM_REAL_SEC_PER_TACTICAL_TURN / ( giTimeCompressSpeeds[ giTimeCompressMode ] * RT_COMPRESSION_TACTICAL_TURN_MODIFIER );
|
||||
uiCheckTime = NUM_REAL_SEC_PER_TACTICAL_TURN / ( giTimeCompressSpeeds[ giTimeCompressMode ] * RT_COMPRESSION_TACTICAL_TURN_MODIFIER );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,4 +110,4 @@ void HandleStrategicTurnImplicationsOfExitingCombatMode( void )
|
||||
{
|
||||
SyncStrategicTurnTimes();
|
||||
HandleTacticalEndTurn( /*GetWorldTotalSeconds()*/ ); // doesn't take parameters
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user