From 26aca5ac43bc6b3ec142751aab5bffef4d75a078 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 10 May 2011 22:38:05 +1000
Subject: TSAGE: Standardised on checks for showing the Save and Restore
 dialogs

---
 engines/tsage/ringworld_logic.cpp | 4 ++--
 engines/tsage/tsage.cpp           | 4 ++--
 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);
 }
 
 /**
-- 
cgit v1.2.3