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

Merged from revision: 7046

Browse Source 
Feature Improvement: Fast Forward Turn (by Sevenfm)
0 - default behaviour
1 - auto fast forward only invisible
2 - auto fast forward always

AUTO_FAST_FORWARD_CIVS = 0
AUTO_FAST_FORWARD_CREATURES = 0

- Minor cosmetic fixes/improvements

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-03-10 19:19:23 +00:00
parent fefbbc8e88
commit b6796d022c
4 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+2
View File
@@ -2190,6 +2190,8 @@ void LoadGameExternalOptions()
// sevenfm: improved auto fast forwarding
gGameExternalOptions.ubAutoFastForwardEnemies = iniReader.ReadInteger("Clock Settings","AUTO_FAST_FORWARD_ENEMIES", 0, 0, 3);
gGameExternalOptions.ubAutoFastForwardMilitia = iniReader.ReadInteger("Clock Settings", "AUTO_FAST_FORWARD_MILITIA", 0, 0, 2);
gGameExternalOptions.ubAutoFastForwardCivs = iniReader.ReadInteger("Clock Settings", "AUTO_FAST_FORWARD_CIVS", 0, 0, 2);
gGameExternalOptions.ubAutoFastForwardCreatures = iniReader.ReadInteger("Clock Settings", "AUTO_FAST_FORWARD_CREATURES", 0, 0, 2);
}
GameSettings.h
+2
View File
@@ -1280,6 +1280,8 @@ typedef struct
// sevenfm: improved auto fast forwarding
UINT8 ubAutoFastForwardEnemies;
UINT8 ubAutoFastForwardMilitia;
UINT8 ubAutoFastForwardCivs;
UINT8 ubAutoFastForwardCreatures;
// Flugente: Weapon Overheating
BOOLEAN fWeaponOverheating; // Should weapons overheat, thus increasing the chance of malfunction?
Tactical/Interface.cpp
+4 -3
View File
@@ -1876,7 +1876,7 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
BOOLEAN bInCombat = gTacticalStatus.uiFlags & TURNBASED && gTacticalStatus.uiFlags & INCOMBAT;
BOOLEAN bStealth = pSoldier->bStealthMode || pSoldier->bSoldierFlagMask & ( SOLDIER_COVERT_CIV | SOLDIER_COVERT_SOLDIER );
// sevenfm: for mercs use name color as cover indicator
if( pSoldier->bSide == 0 && ! ( pSoldier->flags.uiStatusFlags & ( SOLDIER_VEHICLE | SOLDIER_ROBOT) ) &&
if( pSoldier->bTeam == OUR_TEAM && ! ( pSoldier->flags.uiStatusFlags & ( SOLDIER_VEHICLE | SOLDIER_ROBOT) ) &&
( ( gGameExternalOptions.ubShowCoverIndicator == 2 && ( bInCombat || bStealth ) ) ||
( gGameExternalOptions.ubShowCoverIndicator == 4 && bStealth ) ) )
{
@@ -6067,8 +6067,9 @@ BOOLEAN CoverColorCode( INT8 cover, INT16 &color8, INT16 &color16 ){
switch(cover)
{
case 0:
color8 = COLOR_RED;
color16 = Get16BPPColor( FROMRGB( 200, 0, 0 ) );
//color8 = COLOR_RED;
color8 = FONT_MCOLOR_RED;
color16 = Get16BPPColor( FROMRGB( 220, 0, 0 ) );
break;
case 1:
color8 = COLOR_ORANGE;
TacticalAI/AIMain.cpp
+32
View File
@@ -2650,6 +2650,38 @@ void UpdateFastForwardMode( SOLDIERTYPE* pSoldier )
break;
}
}
else if ( pSoldier->bTeam == CIV_TEAM )
{
switch( gGameExternalOptions.ubAutoFastForwardCivs )
{
case 0: // default mode
forward = gGameSettings.fOptions[TOPTION_AUTO_FAST_FORWARD_MODE];
break;
case 1: // auto fast forward only invisible civs
if( pSoldier->bVisible == -1 )
forward = TRUE && !action;
break;
case 2: // auto fast forward civs always
forward = TRUE && !action;
break;
}
}
else if ( pSoldier->bTeam == CREATURE_TEAM )
{
switch( gGameExternalOptions.ubAutoFastForwardCreatures )
{
case 0: // default mode
forward = gGameSettings.fOptions[TOPTION_AUTO_FAST_FORWARD_MODE];
break;
case 1: // auto fast forward only invisible
if( pSoldier->bVisible == -1 )
forward = TRUE && !action;
break;
case 2: // auto fast forward always
forward = TRUE && !action;
break;
}
}
else
{
switch ( gGameExternalOptions.ubAutoFastForwardEnemies )