mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
Merged from revision: 7099
Minor fixes/improvements for existing features (by Sevenfm) 1) Slightly reduced the size of merc's healthbar to fit general ja visual style. 2) Removed some unnecessary options for SHOW_HEALTHBARSOVERHEAD, SHOW_COVER_INDICATOR. 3) Several minor fixes. 4) New option: ENEMY_CLOCK_SPEED_PERCENT - set clock speed during enemy turns. With this option, player can set default speed to comfortable value (100-120) and set increased speed for enemy turns (150-200). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7100 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -167,6 +167,7 @@ void StartPlayerTeamTurn( BOOLEAN fDoBattleSnd, BOOLEAN fEnteringCombatMode )
|
||||
// EV_S_BEGINTURN SBeginTurn;
|
||||
|
||||
SetFastForwardMode(FALSE);
|
||||
SetClockSpeedPercent(gGameExternalOptions.fClockSpeedPercent); // sevenfm: set default clock speed
|
||||
|
||||
gTacticalStatus.ubDisablePlayerInterrupts = FALSE;
|
||||
|
||||
@@ -527,6 +528,8 @@ void BeginTeamTurn( UINT8 ubTeam )
|
||||
SetFastForwardMode( (ubTeam != OUR_TEAM) );
|
||||
}
|
||||
}
|
||||
if( !is_networked && ubTeam != OUR_TEAM )
|
||||
SetClockSpeedPercent(gGameExternalOptions.fEnemyClockSpeedPercent); // sevenfm: set clock speed for enemy turn
|
||||
|
||||
while( 1 )
|
||||
{
|
||||
@@ -855,6 +858,7 @@ void StartInterrupt( void )
|
||||
|
||||
// disable ff mode
|
||||
SetFastForwardMode(FALSE);
|
||||
SetClockSpeedPercent(gGameExternalOptions.fClockSpeedPercent); // sevenfm: set default clock speed
|
||||
|
||||
// build string for display of who gets interrupt
|
||||
//while( 1 )
|
||||
@@ -1489,6 +1493,8 @@ void EndInterrupt( BOOLEAN fMarkInterruptOccurred )
|
||||
SetFastForwardMode( (gTacticalStatus.ubCurrentTeam != OUR_TEAM) );
|
||||
}
|
||||
}
|
||||
if( !is_networked && gTacticalStatus.ubCurrentTeam != OUR_TEAM )
|
||||
SetClockSpeedPercent(gGameExternalOptions.fEnemyClockSpeedPercent); // sevenfm: set clock speed for enemy turn
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user