[Scummvm-cvs-logs] SF.net SVN: scummvm:[33848] scummvm/branches/gsoc2008-rtl/engines

cpage88 at users.sourceforge.net cpage88 at users.sourceforge.net
Wed Aug 13 22:45:04 CEST 2008


Revision: 33848
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33848&view=rev
Author:   cpage88
Date:     2008-08-13 20:45:00 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
Cleanup: Got rid of _quit and _rtl variables in engine.h/.cpp which are not used anymore.  Found some _quit flags in Agos and Gob and replaced with bool quit() where appropriate

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/agos/animation.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/input.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/oracle.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/saveload.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/script.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/script_e1.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/script_e2.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/script_s1.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/script_ww.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/verb.cpp
    scummvm/branches/gsoc2008-rtl/engines/agos/window.cpp
    scummvm/branches/gsoc2008-rtl/engines/engine.cpp
    scummvm/branches/gsoc2008-rtl/engines/engine.h
    scummvm/branches/gsoc2008-rtl/engines/gob/sound/sound.cpp

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/animation.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/animation.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/animation.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -150,7 +150,7 @@
 
 	startSound();
 
-	while (_frameNum < _framesCount && !_vm->_quit)
+	while (_frameNum < _framesCount && !_vm->quit())
 		handleNextFrame();
 
 	closeFile();

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/input.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/input.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/input.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -123,7 +123,7 @@
 	clearName();
 	_lastNameOn = last;
 
-	while (!_quit) {
+	while (!quit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = 0;
 		_leftButtonDown = 0;
@@ -145,7 +145,7 @@
 			}
 
 			delay(100);
-		} while ((_lastHitArea3 == (HitArea *) -1 || _lastHitArea3 == 0) && !_quit);
+		} while ((_lastHitArea3 == (HitArea *) -1 || _lastHitArea3 == 0) && !quit());
 
 		if (_lastHitArea == NULL) {
 		} else if (_lastHitArea->id == 0x7FFB) {

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/oracle.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/oracle.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/oracle.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -459,7 +459,7 @@
 	}
 
 	windowPutChar(window, 0x7f);
-	while (!_quit) {
+	while (!quit()) {
 		_keyPressed.reset();
 		delay(1);
 

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/saveload.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/saveload.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/saveload.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -279,11 +279,11 @@
 	name = buf;
 	_saveGameNameLen = 0;
 
-	while (!_quit) {
+	while (!quit()) {
 		windowPutChar(window, 128);
 		_keyPressed.reset();
 
-		while (!_quit) {
+		while (!quit()) {
 			delay(10);
 			if (_keyPressed.ascii && _keyPressed.ascii < 128) {
 				i = _keyPressed.ascii;
@@ -443,7 +443,7 @@
 
 		name = buf + 192;
 
-		while (!_quit) {
+		while (!quit()) {
 			windowPutChar(window, 128);
 
 			_saveLoadEdit = true;
@@ -516,7 +516,7 @@
 
 	_keyPressed.reset();
 
-	while (!_quit) {
+	while (!quit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = NULL;
 
@@ -526,7 +526,7 @@
 				return _keyPressed.ascii;
 			}
 			delay(10);
-		} while (_lastHitArea3 == 0 && !_quit);
+		} while (_lastHitArea3 == 0 && !quit());
 
 		ha = _lastHitArea;
 		if (ha == NULL || ha->id < 200) {
@@ -708,7 +708,7 @@
 			_saveGameNameLen++;
 		}
 
-		while (!_quit) {
+		while (!quit()) {
 			windowPutChar(window, 127);
 
 			_saveLoadEdit = true;
@@ -787,7 +787,7 @@
 
 	_keyPressed.reset();
 
-	while (!_quit) {
+	while (!quit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = NULL;
 
@@ -797,7 +797,7 @@
 				return _keyPressed.ascii;
 			}
 			delay(10);
-		} while (_lastHitArea3 == 0 && !_quit);
+		} while (_lastHitArea3 == 0 && !quit());
 
 		ha = _lastHitArea;
 		if (ha == NULL || ha->id < 205) {

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/script.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/script.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/script.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -1012,7 +1012,7 @@
 		executeOpcode(_opcode);
 	} while  (getScriptCondition() != flag && !getScriptReturn() && !quit());
 
-	return (_quit) ? 1 : getScriptReturn();
+	return (quit()) ? 1 : getScriptReturn();
 }
 
 Child *nextSub(Child *sub, int16 key) {

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/script_e1.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/script_e1.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/script_e1.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -1052,11 +1052,11 @@
 	ha->priority = 999;
 	ha->window = 0;
 
-	while (!_quit) {
+	while (!quit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = NULL;
 
-		while (!_quit) {
+		while (!quit()) {
 			if (_lastHitArea3 != 0)
 				break;
 			delay(1);
@@ -1101,11 +1101,11 @@
 	ha->priority = 999;
 	ha->window = 0;
 
-	while (!_quit) {
+	while (!quit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = NULL;
 
-		while (!_quit) {
+		while (!quit()) {
 			if (_lastHitArea3 != 0)
 				break;
 			delay(1);

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/script_e2.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/script_e2.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/script_e2.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -370,11 +370,11 @@
 	uint32 pauseTime = getTime();
 	haltAnimation();
 
-	while (!_quit) {
+	while (!quit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = NULL;
 
-		while (!_quit) {
+		while (!quit()) {
 			if (processSpecialKeys() != 0 || _lastHitArea3 != 0)
 				break;
 			delay(1);

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/script_s1.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/script_s1.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/script_s1.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -338,7 +338,7 @@
 		break;
 	}
 
-	while (!_quit) {
+	while (!quit()) {
 		delay(1);
 		if (_keyPressed.keycode == keyYes)
 			quitGame();

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/script_ww.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/script_ww.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/script_ww.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -368,11 +368,11 @@
 	uint32 pauseTime = getTime();
 	haltAnimation();
 
-	while (!_quit) {
+	while (!quit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = NULL;
 
-		while (!_quit) {
+		while (!quit()) {
 			if (_lastHitArea3 != 0)
 				break;
 			delay(1);

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/verb.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/verb.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/verb.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -343,7 +343,7 @@
 	Subroutine *sub;
 	int result;
 
-	if (_quit)
+	if (quit())
 		return;
 
 	_objectItem = _hitAreaObjectItem;

Modified: scummvm/branches/gsoc2008-rtl/engines/agos/window.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agos/window.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/agos/window.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -298,11 +298,11 @@
 	ha->id = 0x7FFF;
 	ha->priority = 999;
 
-	while (!_quit) {
+	while (!quit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = NULL;
 
-		for (;;) {
+		while (!quit()) {
 			if (_lastHitArea3 != 0)
 				break;
 			delay(1);

Modified: scummvm/branches/gsoc2008-rtl/engines/engine.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/engine.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/engine.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -57,9 +57,7 @@
 		_targetName(ConfMan.getActiveDomainName()),
 		_gameDataPath(ConfMan.get("path")),
 		_pauseLevel(0),
-		_mainMenuDialog(NULL),
-		_quit(false),
-		_rtl(false) {
+		_mainMenuDialog(NULL) {
 
 	g_engine = this;
 	_autosavePeriod = ConfMan.getInt("autosave_period");

Modified: scummvm/branches/gsoc2008-rtl/engines/engine.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/engine.h	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/engine.h	2008-08-13 20:45:00 UTC (rev 33848)
@@ -51,8 +51,6 @@
 	Audio::Mixer *_mixer;
 	Common::TimerManager * _timer;
 
-	bool _quit, _rtl;
-
 protected:
 	Common::EventManager *_eventMan;
 	Common::SaveFileManager *_saveFileMan;

Modified: scummvm/branches/gsoc2008-rtl/engines/gob/sound/sound.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/gob/sound/sound.cpp	2008-08-13 20:37:54 UTC (rev 33847)
+++ scummvm/branches/gsoc2008-rtl/engines/gob/sound/sound.cpp	2008-08-13 20:45:00 UTC (rev 33848)
@@ -369,7 +369,7 @@
 	if (stopComp)
 		_blaster->endComposition();
 
-	while (_blaster->isPlaying() && !_vm->_quit) {
+	while (_blaster->isPlaying() && !_vm->quit()) {
 		if (interruptible && (_vm->_util->checkKey() == 0x11B)) {
 			WRITE_VAR(57, (uint32) -1);
 			return;


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




More information about the Scummvm-git-logs mailing list