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

cpage88 at users.sourceforge.net cpage88 at users.sourceforge.net
Wed Jun 25 04:14:56 CEST 2008


Revision: 32774
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32774&view=rev
Author:   cpage88
Date:     2008-06-24 19:14:55 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
Queen and Saga now use the new _quit flag

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp
    scummvm/branches/gsoc2008-rtl/engines/queen/queen.h
    scummvm/branches/gsoc2008-rtl/engines/saga/saga.cpp
    scummvm/branches/gsoc2008-rtl/engines/saga/saga.h

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp	2008-06-25 01:41:40 UTC (rev 32773)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp	2008-06-25 02:14:55 UTC (rev 32774)
@@ -381,7 +381,7 @@
 		loadGameState(ConfMan.getInt("save_slot"));
 	}
 	_lastSaveTime = _lastUpdateTime = _system->getMillis();
-	_quit = false;
+
 	while (!_quit) {
 		if (_logic->newRoom() > 0) {
 			_logic->update();
@@ -400,7 +400,7 @@
 			update(true);
 		}
 	}
-	return 0;
+	return _rtl;
 }
 
 int QueenEngine::init() {

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/queen.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/queen.h	2008-06-25 01:41:40 UTC (rev 32773)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/queen.h	2008-06-25 02:14:55 UTC (rev 32774)
@@ -137,7 +137,6 @@
 
 	int _talkSpeed;
 	bool _subtitles;
-	bool _quit;
 	uint32 _lastSaveTime;
 	uint32 _lastUpdateTime;
 

Modified: scummvm/branches/gsoc2008-rtl/engines/saga/saga.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/saga/saga.cpp	2008-06-25 01:41:40 UTC (rev 32773)
+++ scummvm/branches/gsoc2008-rtl/engines/saga/saga.cpp	2008-06-25 02:14:55 UTC (rev 32774)
@@ -64,7 +64,6 @@
 	_leftMouseButtonPressed = _rightMouseButtonPressed = false;
 
 	_console = NULL;
-	_quit = false;
 
 	_resource = NULL;
 	_sndRes = NULL;
@@ -310,7 +309,7 @@
 		_system->delayMillis(10);
 	}
 
-	return 0;
+	return _rtl;
 }
 
 void SagaEngine::loadStrings(StringsTable &stringsTable, const byte *stringsPointer, size_t stringsLength) {

Modified: scummvm/branches/gsoc2008-rtl/engines/saga/saga.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/saga/saga.h	2008-06-25 01:41:40 UTC (rev 32773)
+++ scummvm/branches/gsoc2008-rtl/engines/saga/saga.h	2008-06-25 02:14:55 UTC (rev 32774)
@@ -610,8 +610,6 @@
 	bool _rightMouseButtonPressed;
 	int _mouseClickCount;
 
-	bool _quit;
-
 //current game description
 	int _gameNumber;
 	const SAGAGameDescription *_gameDescription;


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