[Scummvm-cvs-logs] SF.net SVN: scummvm:[41247] scummvm/trunk/engines/agi

[sev at users.sourceforge.net]

Revision: 41247
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41247&view=rev
Author:   sev
Date:     2009-06-06 17:42:37 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
Stop abusing game flag.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agi/saveload.cpp
    scummvm/trunk/engines/agi/text.cpp

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2009-06-06 17:42:12 UTC (rev 41246)
+++ scummvm/trunk/engines/agi/agi.cpp	2009-06-06 17:42:37 UTC (rev 41247)
@@ -626,7 +626,7 @@
 }
 
 AgiBase::AgiBase(OSystem *syst, const AGIGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
-
+	_noSaveLoadAllowed = false;
 }
 
 AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBase(syst, gameDesc) {

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2009-06-06 17:42:12 UTC (rev 41246)
+++ scummvm/trunk/engines/agi/agi.h	2009-06-06 17:42:37 UTC (rev 41247)
@@ -331,8 +331,7 @@
 	fStatusSelectsItems,
 	fMenusWork,
 	fOutputMode,		// 15
-	fAutoRestart,
-	fNoSaveLoadAllowed
+	fAutoRestart
 };
 
 enum AgiSlowliness {
@@ -726,6 +725,8 @@
 	AgiGame _game;
 	Common::RandomSource *_rnd;
 
+	bool _noSaveLoadAllowed;
+
 	virtual void agiTimerLow() = 0;
 	virtual int agiGetKeypressLow() = 0;
 	virtual int agiIsKeypressLow() = 0;

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2009-06-06 17:42:12 UTC (rev 41246)
+++ scummvm/trunk/engines/agi/detection.cpp	2009-06-06 17:42:37 UTC (rev 41247)
@@ -1178,11 +1178,11 @@
 }
 
 bool AgiBase::canLoadGameStateCurrently() {
-	return (!(getGameType() == GType_PreAGI) && getflag(fMenusWork) && !getflag(fNoSaveLoadAllowed) && _game.inputEnabled);
+	return (!(getGameType() == GType_PreAGI) && getflag(fMenusWork) && !_noSaveLoadAllowed && _game.inputEnabled);
 }
 
 bool AgiBase::canSaveGameStateCurrently() {
-	return (!(getGameType() == GType_PreAGI) && getflag(fMenusWork) && !getflag(fNoSaveLoadAllowed) && _game.inputEnabled);
+	return (!(getGameType() == GType_PreAGI) && getflag(fMenusWork) && !_noSaveLoadAllowed && _game.inputEnabled);
 }
 
 } // End of namespace Agi

Modified: scummvm/trunk/engines/agi/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agi/saveload.cpp	2009-06-06 17:42:12 UTC (rev 41246)
+++ scummvm/trunk/engines/agi/saveload.cpp	2009-06-06 17:42:37 UTC (rev 41247)
@@ -578,7 +578,7 @@
 	int textCentre, buttonLength, buttonX[2], buttonY;
 	const char *buttonText[] = { "  OK  ", "Cancel", NULL };
 
-	setflag(fNoSaveLoadAllowed, true);
+	_noSaveLoadAllowed = true;
 
 	for (i = 0; i < NUM_VISIBLE_SLOTS; i++) {
 		getSavegameDescription(_firstSlot + i, desc[i]);
@@ -763,7 +763,7 @@
 getout:
 	closeWindow();
 
-	setflag(fNoSaveLoadAllowed, false);
+	_noSaveLoadAllowed = false;
 
 	return rc;
 }

Modified: scummvm/trunk/engines/agi/text.cpp
===================================================================
--- scummvm/trunk/engines/agi/text.cpp	2009-06-06 17:42:12 UTC (rev 41246)
+++ scummvm/trunk/engines/agi/text.cpp	2009-06-06 17:42:37 UTC (rev 41247)
@@ -340,7 +340,7 @@
 	int rc = -1;
 	int bx[5], by[5];
 
-	setflag(fNoSaveLoadAllowed, true);
+	_noSaveLoadAllowed = true;
 
 	_sprites->eraseBoth();
 	blitTextbox(m, -1, -1, -1);
@@ -426,7 +426,7 @@
 	closeWindow();
 	debugC(2, kDebugLevelText, "selectionBox(): Result = %d", rc);
 
-	setflag(fNoSaveLoadAllowed, false);
+	_noSaveLoadAllowed = false;
 
 	return rc;
 }
@@ -456,7 +456,7 @@
 
 	// blocking
 
-	setflag(fNoSaveLoadAllowed, true);
+	_noSaveLoadAllowed = true;
 
 	if (_game.vars[vWindowReset] == 0) {
 		int k;
@@ -464,7 +464,7 @@
 		k = waitKey();
 		closeWindow();
 
-		setflag(fNoSaveLoadAllowed, false);
+		_noSaveLoadAllowed = false;
 
 		return k;
 	}
@@ -492,7 +492,7 @@
 
 	closeWindow();
 
-	setflag(fNoSaveLoadAllowed, false);
+	_noSaveLoadAllowed = false;
 
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.