[Scummvm-cvs-logs] scummvm master -> 647bc59f992e77fa65dfa7e1e000b85a9ea55c2a

[Strangerke]

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:
647bc59f99 CGE: Rename variable


Commit: 647bc59f992e77fa65dfa7e1e000b85a9ea55c2a
    https://github.com/scummvm/scummvm/commit/647bc59f992e77fa65dfa7e1e000b85a9ea55c2a
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-06-27T22:19:54-07:00

Commit Message:
CGE: Rename variable

Changed paths:
    engines/cge/cge.cpp
    engines/cge/cge.h
    engines/cge/cge_main.cpp



diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 09fce63..2f5acfa 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -124,7 +124,7 @@ void CGEEngine::init() {
 	_maxScene   =  0;
 	_dark       = false;
 	_game       = false;
-	_finis      = false;
+	_endGame    = false;
 	_now        =  1;
 	_lev        = -1;
 	_recentStep = -2;
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index a5c6a62..c5be782 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -159,7 +159,7 @@ public:
 	bool   _flag[4];
 	bool   _dark;
 	bool   _game;
-	bool   _finis;
+	bool   _endGame;
 	int    _now;
 	int    _lev;
 	int    _mode;
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index bef4f61..dd1c78d 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -706,7 +706,7 @@ void CGEEngine::qGame() {
 	saveGame(0, Common::String("Automatic Savegame"));
 
 	_vga->sunset();
-	_finis = true;
+	_endGame = true;
 }
 
 void CGEEngine::switchScene(int newScene) {
@@ -1403,14 +1403,14 @@ void CGEEngine::runGame() {
 
 	_keyboard->setClient(_sys);
 	// main loop
-	while (!_finis && !_quitFlag) {
-		if (_flag[3])
+	while (!_endGame && !_quitFlag) {
+		if (_flag[3]) // Flag FINIS
 			_commandHandler->addCallback(kCmdExec,  -1, 0, kQGame);
 		mainLoop();
 	}
 
 	// If finishing game due to closing ScummVM window, explicitly save the game
-	if (!_finis && canSaveGameStateCurrently())
+	if (!_endGame && canSaveGameStateCurrently())
 		qGame();
 
 	_keyboard->setClient(NULL);