mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
New ingame options screen (by rftr).
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:
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user