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

New ingame options screen (by rftr).

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-11-17 07:50:20 +00:00
parent f6fd480c45
commit 1ee875be61
34 changed files with 1509 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle UI.cpp
+1 -1
View File
@@ -1360,7 +1360,7 @@ UINT32 UIHandleEndTurn( UI_EVENT *pUIEvent )
//if( FileExists( "..\\AutoSave.pls" ) && CanGameBeSaved() )
if (gGameSettings.fOptions[TOPTION_USE_AUTO_SAVE] == TRUE && CanGameBeSaved() )
{
guiPreviousOptionScreen = guiCurrentScreen;
SetOptionsPreviousScreen(guiCurrentScreen);
//increment end turn number
++guiLastSaveGameNum;
Tactical/Interface Panels.cpp
+1 -1
View File
@@ -4906,7 +4906,7 @@ void BtnOptionsCallback(GUI_BUTTON *btn,INT32 reason)
{
btn->uiFlags &= (~BUTTON_CLICKED_ON );
guiPreviousOptionScreen = guiCurrentScreen;
SetOptionsPreviousScreen(guiCurrentScreen);
LeaveTacticalScreen( OPTIONS_SCREEN );
}
Tactical/Ja25_Tactical.cpp
+1
View File
@@ -1936,6 +1936,7 @@ void HandlePlayerHittingSwitchToLaunchMissles()
//
gGameSettings.fPlayerFinishedTheGame = TRUE;
SaveGameSettings();
SaveFeatureFlags();
//Update the quest log
InternalEndQuest( QUEST_DESTROY_MISSLES, -1, -1, TRUE );
Tactical/Turn Based Input.cpp
+5 -5
View File
@@ -1832,7 +1832,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
gfSaveGame = FALSE;
gfCameDirectlyFromGame = TRUE;
guiPreviousOptionScreen = GAME_SCREEN;
SetOptionsPreviousScreen(GAME_SCREEN);
EscapeUILock();
// cancel, the player can move when it is not its turn!
@@ -1856,7 +1856,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
gfSaveGame = FALSE;
gfCameDirectlyFromGame = TRUE;
guiPreviousOptionScreen = GAME_SCREEN;
SetOptionsPreviousScreen(GAME_SCREEN);
LeaveTacticalScreen( SAVE_LOAD_SCREEN );
}
}
@@ -4116,7 +4116,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
if ( !fDisableMapInterfaceDueToBattle )
{
// go to Options screen
guiPreviousOptionScreen = GAME_SCREEN;
SetOptionsPreviousScreen(GAME_SCREEN);
LeaveTacticalScreen( OPTIONS_SCREEN );
}
}
@@ -4241,7 +4241,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
gfSaveGame = TRUE;
gfCameDirectlyFromGame = TRUE;
guiPreviousOptionScreen = GAME_SCREEN;
SetOptionsPreviousScreen(GAME_SCREEN);
LeaveTacticalScreen( SAVE_LOAD_SCREEN );
}
else
@@ -4273,7 +4273,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
//if the game CAN be saved
if ( CanGameBeSaved() )
{
guiPreviousOptionScreen = GAME_SCREEN;
SetOptionsPreviousScreen(GAME_SCREEN);
//guiPreviousOptionScreen = guiCurrentScreen;
DoQuickSave();
}