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

cpage88 at users.sourceforge.net cpage88 at users.sourceforge.net
Fri Jul 11 02:49:02 CEST 2008


Revision: 32999
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32999&view=rev
Author:   cpage88
Date:     2008-07-10 17:49:01 -0700 (Thu, 10 Jul 2008)

Log Message:
-----------
Queen works with the new GMM implementation, and made a correction to a change in parallaction

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/backends/events/default/default-events.cpp
    scummvm/branches/gsoc2008-rtl/engines/parallaction/input.cpp
    scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp
    scummvm/branches/gsoc2008-rtl/engines/queen/journal.cpp
    scummvm/branches/gsoc2008-rtl/engines/queen/logic.cpp
    scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp
    scummvm/branches/gsoc2008-rtl/engines/queen/queen.h
    scummvm/branches/gsoc2008-rtl/engines/queen/talk.cpp

Modified: scummvm/branches/gsoc2008-rtl/backends/events/default/default-events.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/events/default/default-events.cpp	2008-07-10 23:04:57 UTC (rev 32998)
+++ scummvm/branches/gsoc2008-rtl/backends/events/default/default-events.cpp	2008-07-11 00:49:01 UTC (rev 32999)
@@ -435,6 +435,8 @@
 		case Common::EVENT_MAINMENU:
 			if (g_engine && !g_engine->isPaused())
 				g_engine->mainMenuDialog();
+			if (_shouldQuit)
+				event.type = Common::EVENT_QUIT;
 			break;
 
 		case Common::EVENT_RTL:

Modified: scummvm/branches/gsoc2008-rtl/engines/parallaction/input.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/parallaction/input.cpp	2008-07-10 23:04:57 UTC (rev 32998)
+++ scummvm/branches/gsoc2008-rtl/engines/parallaction/input.cpp	2008-07-11 00:49:01 UTC (rev 32999)
@@ -80,7 +80,7 @@
 			break;
 
 		case Common::EVENT_QUIT:
-			_quit = true;
+			_vm->_quit = true;
 			return KeyDown;
 
 		default:

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp	2008-07-10 23:04:57 UTC (rev 32998)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp	2008-07-11 00:49:01 UTC (rev 32999)
@@ -120,7 +120,6 @@
 				break;
 
 			case Common::EVENT_QUIT:
-				_vm->quitGame();
 				if (_cutawayRunning)
 					_cutawayQuit = true;
 				return;

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/journal.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/journal.cpp	2008-07-10 23:04:57 UTC (rev 32998)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/journal.cpp	2008-07-11 00:49:01 UTC (rev 32999)
@@ -85,7 +85,6 @@
 				handleMouseWheel(1);
 				break;
 			case Common::EVENT_QUIT:
-				_vm->quitGame();
 				return;
 			default:
 				break;

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/logic.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/logic.cpp	2008-07-10 23:04:57 UTC (rev 32998)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/logic.cpp	2008-07-11 00:49:01 UTC (rev 32999)
@@ -2076,7 +2076,7 @@
 		displayRoom(currentRoom(), RDM_FADE_NOJOE, 100, 2, true);
 		playCutaway("CLOGO.CUT");
 		sceneReset();
-		if (_vm->_quit)
+		if (_vm->quit())
 			return true;
 		currentRoom(ROOM_HOTEL_LOBBY);
 		entryObj(584);
@@ -2131,10 +2131,10 @@
 	} else if (currentRoom() == FOTAQ_LOGO && gameState(VAR_INTRO_PLAYED) == 0) {
 		displayRoom(currentRoom(), RDM_FADE_NOJOE, 100, 2, true);
 		playCutaway("COPY.CUT");
-		if (_vm->_quit)
+		if (_vm->quit())
 			return true;
 		playCutaway("CLOGO.CUT");
-		if (_vm->_quit)
+		if (_vm->quit())
 			return true;
 		if (_vm->resource()->getPlatform() != Common::kPlatformAmiga) {
 			if (ConfMan.getBool("alt_intro") && _vm->resource()->isCD()) {
@@ -2143,10 +2143,10 @@
 				playCutaway("CDINT.CUT");
 			}
 		}
-		if (_vm->_quit)
+		if (_vm->quit())
 			return true;
 		playCutaway("CRED.CUT");
-		if (_vm->_quit)
+		if (_vm->quit())
 			return true;
 		_vm->display()->palSetPanel();
 		sceneReset();

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp	2008-07-10 23:04:57 UTC (rev 32998)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp	2008-07-11 00:49:01 UTC (rev 32999)
@@ -386,7 +386,7 @@
 	}
 	_lastSaveTime = _lastUpdateTime = _system->getMillis();
 
-	while (!_quit) {
+	while (!quit()) {
 		if (_logic->newRoom() > 0) {
 			_logic->update();
 			_logic->oldRoom(_logic->currentRoom());
@@ -404,7 +404,7 @@
 			update(true);
 		}
 	}
-	return _rtl;
+	return _eventMan->shouldRTL();
 }
 
 int QueenEngine::init() {

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/queen.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/queen.h	2008-07-10 23:04:57 UTC (rev 32998)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/queen.h	2008-07-11 00:49:01 UTC (rev 32999)
@@ -103,8 +103,7 @@
 	void talkSpeed(int speed) { _talkSpeed = speed; }
 	bool subtitles() const { return _subtitles; }
 	void subtitles(bool enable) { _subtitles = enable; }
-	void quitGame() { _quit = true; }
-
+	
 	void update(bool checkPlayerInput = false);
 
 	bool canLoadOrSave() const;

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/talk.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/talk.cpp	2008-07-10 23:04:57 UTC (rev 32998)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/talk.cpp	2008-07-11 00:49:01 UTC (rev 32999)
@@ -807,7 +807,7 @@
 
 	switch (command) {
 	case SPEAK_PAUSE:
-		for (i = 0; i < 10 && !_vm->input()->talkQuit(); i++) {
+		for (i = 0; i < 10 && !_vm->input()->talkQuit() && !_vm->quit(); i++) {
 			_vm->update();
 		}
 		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