diff --git a/GameSettings.cpp b/GameSettings.cpp index 6b7ef02c..ef7177ae 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -1458,6 +1458,9 @@ void LoadGameExternalOptions() // CtH/2 if the target are out of gun range or invisible for this merc gGameExternalOptions.fOutOfGunRangeOrSight = iniReader.ReadFloat("Tactical Interface Settings","OUT_OF_SIGHT_OR_GUN_RANGE",2,1,100); + + // anv: automatically return to team panel on turn end (better situation overview during enemy turn) + gGameExternalOptions.fAutoCollapseInventoryOnTurnEnd = iniReader.ReadBoolean("Tactical Interface Settings","AUTO_COLLAPSE_INVENTORY_ON_TURN_END", TRUE); // *** ddd - END // SANDRO - Improved camo applying and camo can be removed diff --git a/GameSettings.h b/GameSettings.h index 0f1e7ac1..428d5083 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -827,6 +827,10 @@ typedef struct FLOAT uWeightDivisor; FLOAT fOutOfGunRangeOrSight; + + // anv: automatically return to team panel on turn end (better situation overview during enemy turn) + BOOLEAN fAutoCollapseInventoryOnTurnEnd; + // WANNE: Always use "prof.dat". BOOLEAN fUseDifficultyBasedProfDat; diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp index 379cb1a8..20311157 100644 --- a/Tactical/Handle UI.cpp +++ b/Tactical/Handle UI.cpp @@ -1337,6 +1337,10 @@ UINT32 UIHandleEndTurn( UI_EVENT *pUIEvent ) } } + // anv: automatically return to team panel on turn end (better situation overview during enemy turn) + if( gGameExternalOptions.fAutoCollapseInventoryOnTurnEnd == TRUE ) + SetCurrentInterfacePanel( TEAM_PANEL ); + return( GAME_SCREEN ); } diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index 141d2000..d0f25361 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -2146,6 +2146,12 @@ BOOLEAN InitializeSMPanel( ) // full cursor - disable, from item pickup EnableSMPanelButtons( FALSE, TRUE ); } + + if( INTERFACE_START_X > 0 ) + { + ColorFillVideoSurfaceArea( FRAME_BUFFER, 0, INV_INTERFACE_START_Y, SCREEN_WIDTH, SCREEN_HEIGHT, 0 ); + ColorFillVideoSurfaceArea( guiSAVEBUFFER, 0, INV_INTERFACE_START_Y, SCREEN_WIDTH, SCREEN_HEIGHT, 0 ); + } return( TRUE ); }