[Scummvm-cvs-logs] scummvm master -> 264222ec2984b5fd775d589c22f636d7a9baefc7

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
264222ec29 AGI: Change _game.exitAllLogics to boolean


Commit: 264222ec2984b5fd775d589c22f636d7a9baefc7
    https://github.com/scummvm/scummvm/commit/264222ec2984b5fd775d589c22f636d7a9baefc7
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-01T16:15:07+01:00

Commit Message:
AGI: Change _game.exitAllLogics to boolean

Changed paths:
    engines/agi/agi.h
    engines/agi/saveload.cpp



diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 58fb173..e7ca9d3 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -444,7 +444,7 @@ struct AgiGame {
 
 	// internal flags
 	bool playerControl;		/**< player is in control */
-	int exitAllLogics;	/**< break cycle after new.room */
+	bool exitAllLogics;	/**< break cycle after new.room */
 	bool pictureShown;		/**< show.pic has been issued */
 #define ID_AGDS		0x00000001
 #define ID_AMIGA	0x00000002
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index 90e42ca..3d67db7 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -762,7 +762,7 @@ int AgiEngine::doLoad(int slot, bool showMessages) {
 	int result = loadGame(fileName);
 
 	if (result == errOK) {
-		_game.exitAllLogics = 1;
+		_game.exitAllLogics = true;
 		_menu->itemEnableAll();
 	} else {
 		if (showMessages)
@@ -1010,7 +1010,7 @@ void AgiEngine::checkQuickLoad() {
 		_sound->stopSound();
 
 		if (loadGame(saveNameBuffer, false) == errOK) {	 // Do not check game id
-			_game.exitAllLogics = 1;
+			_game.exitAllLogics = true;
 			_menu->itemEnableAll();
 		}
 	}
@@ -1023,7 +1023,7 @@ Common::Error AgiEngine::loadGameState(int slot) {
 	_sound->stopSound();
 
 	if (loadGame(saveLoadSlot) == errOK) {
-		_game.exitAllLogics = 1;
+		_game.exitAllLogics = true;
 		_menu->itemEnableAll();
 		return Common::kNoError;
 	} else {