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

[cpage88 at users.sourceforge.net]

Revision: 32525
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32525&view=rev
Author:   cpage88
Date:     2008-06-03 22:21:47 -0700 (Tue, 03 Jun 2008)

Log Message:
-----------
QUEEN: Modified engine to use a quit flag instead of system->quit() in order to return to the launcher

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

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp	2008-06-04 01:27:55 UTC (rev 32524)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/input.cpp	2008-06-04 05:21:47 UTC (rev 32525)
@@ -27,6 +27,7 @@
 #include "common/events.h"
 #include "common/system.h"
 
+#include "queen/queen.h"
 #include "queen/input.h"
 
 namespace Queen {
@@ -51,12 +52,12 @@
 	VERB_USE
 };
 
-Input::Input(Common::Language language, OSystem *system) :
+Input::Input(Common::Language language, OSystem *system, QueenEngine *vm) :
 	_system(system), _eventMan(system->getEventManager()), _fastMode(false),
 	_keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false),
 	_cutawayQuit(false), _dialogueRunning(false), _talkQuit(false),
 	_quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INVALID),
-	_mouseButton(0), _idleTime(0) {
+	_mouseButton(0), _idleTime(0) , _vm(vm) {
 
 	switch (language) {
 	case Common::EN_ANY:
@@ -119,8 +120,8 @@
 				break;
 
 			case Common::EVENT_QUIT:
-				_system->quit();
-				break;
+				_vm->quitGame();
+				return;
 
 			default:
 				break;

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/input.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/input.h	2008-06-04 01:27:55 UTC (rev 32524)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/input.h	2008-06-04 05:21:47 UTC (rev 32525)
@@ -49,7 +49,7 @@
 		MOUSE_RBUTTON = 2
 	};
 
-	Input(Common::Language language, OSystem *system);
+	Input(Common::Language language, OSystem *system, QueenEngine *vm);
 
 	void delay(uint amount);
 
@@ -99,6 +99,8 @@
 
 	Common::EventManager *_eventMan;
 
+	QueenEngine *_vm;
+
 	//! some cutaways require update() run faster
 	bool _fastMode;
 

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/journal.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/journal.cpp	2008-06-04 01:27:55 UTC (rev 32524)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/journal.cpp	2008-06-04 05:21:47 UTC (rev 32525)
@@ -85,8 +85,8 @@
 				handleMouseWheel(1);
 				break;
 			case Common::EVENT_QUIT:
-				_system->quit();
-				break;
+				_vm->quitGame();
+				return;
 			default:
 				break;
 			}

Modified: scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp	2008-06-04 01:27:55 UTC (rev 32524)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp	2008-06-04 05:21:47 UTC (rev 32525)
@@ -418,7 +418,7 @@
 	_display = new Display(this, _system);
 	_graphics = new Graphics(this);
 	_grid = new Grid(this);
-	_input = new Input(_resource->getLanguage(), _system);
+	_input = new Input(_resource->getLanguage(), _system, this);
 
 	if (_resource->isDemo()) {
 		_logic = new LogicDemo(this);


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