aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-05-10 22:38:05 +1000
committerPaul Gilbert2011-05-10 22:38:05 +1000
commit26aca5ac43bc6b3ec142751aab5bffef4d75a078 (patch)
treefb0ad3556085bd9c68f889c9f0d437ff9fed3047
parent2e3474771206f3542b71920d93305ba0eb843ea1 (diff)
downloadscummvm-rg350-26aca5ac43bc6b3ec142751aab5bffef4d75a078.tar.gz
scummvm-rg350-26aca5ac43bc6b3ec142751aab5bffef4d75a078.tar.bz2
scummvm-rg350-26aca5ac43bc6b3ec142751aab5bffef4d75a078.zip
TSAGE: Standardised on checks for showing the Save and Restore dialogs
-rw-r--r--engines/tsage/ringworld_logic.cpp4
-rw-r--r--engines/tsage/tsage.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index 4321c53c47..d334e0ce1f 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -1288,7 +1288,7 @@ void RingworldGame::restartGame() {
}
void RingworldGame::saveGame() {
- if (_globals->getFlag(50))
+ if (!_vm->canSaveGameStateCurrently())
MessageDialog::show(SAVING_NOT_ALLOWED_MSG, OK_BTN_STRING);
else {
// Show the save dialog
@@ -1297,7 +1297,7 @@ void RingworldGame::saveGame() {
}
void RingworldGame::restoreGame() {
- if (_globals->getFlag(50))
+ if (!_vm->canLoadGameStateCurrently())
MessageDialog::show(RESTORING_NOT_ALLOWED_MSG, OK_BTN_STRING);
else {
// Show the load dialog
diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index d6f07c999b..8813fc7e45 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -101,14 +101,14 @@ Common::Error TSageEngine::run() {
* Returns true if it is currently okay to restore a game
*/
bool TSageEngine::canLoadGameStateCurrently() {
- return (_globals->getFlag(50) == 0) && _globals->_player._uiEnabled;
+ return (_globals->getFlag(50) == 0);
}
/**
* Returns true if it is currently okay to save the game
*/
bool TSageEngine::canSaveGameStateCurrently() {
- return (_globals->getFlag(50) == 0) && _globals->_player._uiEnabled;
+ return (_globals->getFlag(50) == 0);
}
/**