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

[cpage88 at users.sourceforge.net]

Revision: 33000
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33000&view=rev
Author:   cpage88
Date:     2008-07-10 18:09:48 -0700 (Thu, 10 Jul 2008)

Log Message:
-----------
SAGA works with new GMM implementation

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/saga/input.cpp
    scummvm/branches/gsoc2008-rtl/engines/saga/interface.cpp
    scummvm/branches/gsoc2008-rtl/engines/saga/introproc_ihnm.cpp
    scummvm/branches/gsoc2008-rtl/engines/saga/saga.cpp
    scummvm/branches/gsoc2008-rtl/engines/saga/saga.h
    scummvm/branches/gsoc2008-rtl/engines/saga/scene.cpp
    scummvm/branches/gsoc2008-rtl/engines/saga/sfuncs.cpp

Modified: scummvm/branches/gsoc2008-rtl/engines/saga/input.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/saga/input.cpp	2008-07-11 00:49:01 UTC (rev 32999)
+++ scummvm/branches/gsoc2008-rtl/engines/saga/input.cpp	2008-07-11 01:09:48 UTC (rev 33000)
@@ -141,9 +141,6 @@
 			break;
 		case Common::EVENT_MOUSEMOVE:
 			break;
-		case Common::EVENT_QUIT:
-			shutDown();
-			break;
 		default:
 			break;
 		}

Modified: scummvm/branches/gsoc2008-rtl/engines/saga/interface.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/saga/interface.cpp	2008-07-11 00:49:01 UTC (rev 32999)
+++ scummvm/branches/gsoc2008-rtl/engines/saga/interface.cpp	2008-07-11 01:09:48 UTC (rev 33000)
@@ -688,7 +688,7 @@
 			setMode(kPanelMain);
 			_vm->_script->setNoPendingVerb();
 		} else if (ascii == 'q' || ascii == 'Q') {
-			_vm->shutDown();
+			_vm->quitGame();
 		}
 		break;
 	case kPanelBoss:
@@ -1081,7 +1081,7 @@
 			if (_vm->getGameId() == GID_IHNM_DEMO)
 				_vm->_scene->creditsScene();	// display sales info for IHNM demo
 			else
-				_vm->shutDown();
+				_vm->quitGame();
 			break;
 	}
 }

Modified: scummvm/branches/gsoc2008-rtl/engines/saga/introproc_ihnm.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/saga/introproc_ihnm.cpp	2008-07-11 00:49:01 UTC (rev 32999)
+++ scummvm/branches/gsoc2008-rtl/engines/saga/introproc_ihnm.cpp	2008-07-11 01:09:48 UTC (rev 33000)
@@ -59,8 +59,12 @@
 
 		// Play Cyberdreams logo for 168 frames
 		if (!playTitle(0, logoLength, true)) {
+			if (_vm->quit())
+				return !SUCCESS;
 			// Play Dreamers Guild logo for 10 seconds
 			if (!playLoopingTitle(1, 10)) {
+				if (_vm->quit())
+					return !SUCCESS;
 				// Play the title music
 				_vm->_music->play(1, MUSIC_NORMAL);
 				// Play title screen
@@ -70,6 +74,8 @@
 	} else {
 		_vm->_music->play(1, MUSIC_NORMAL);
 		playTitle(0, 10);
+		if (_vm->quit())
+			return !SUCCESS;
 		playTitle(2, 12);
 	}
 
@@ -144,7 +150,6 @@
 		switch (event.type) {
 		case Common::EVENT_QUIT:
 			res = true;
-			_vm->shutDown();
 			break;
 		case Common::EVENT_KEYDOWN:
 			// Don't react to modifier keys alone. The original did
@@ -187,7 +192,7 @@
 
 	_vm->_gfx->getCurrentPal(pal_cut);
 
-	while (!done) {
+	while (!done && !_vm->quit()) {
 		curTime = _vm->_system->getMillis();
 
 		switch (phase) {

Modified: scummvm/branches/gsoc2008-rtl/engines/saga/saga.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/saga/saga.cpp	2008-07-11 00:49:01 UTC (rev 32999)
+++ scummvm/branches/gsoc2008-rtl/engines/saga/saga.cpp	2008-07-11 01:09:48 UTC (rev 33000)
@@ -261,7 +261,7 @@
 
 	uint32 currentTicks;
 
-	while (!_quit) {
+	while (!quit()) {
 		if (_console->isAttached())
 			_console->onFrame();
 
@@ -301,7 +301,7 @@
 		_system->delayMillis(10);
 	}
 
-	return _rtl;
+	return _eventMan->shouldRTL();
 }
 
 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-07-11 00:49:01 UTC (rev 32999)
+++ scummvm/branches/gsoc2008-rtl/engines/saga/saga.h	2008-07-11 01:09:48 UTC (rev 33000)
@@ -491,7 +491,6 @@
 public:
 	SagaEngine(OSystem *syst, const SAGAGameDescription *gameDesc);
 	virtual ~SagaEngine();
-	void shutDown() { _quit = true; }
 
 	void save(const char *fileName, const char *saveName);
 	void load(const char *fileName);

Modified: scummvm/branches/gsoc2008-rtl/engines/saga/scene.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/saga/scene.cpp	2008-07-11 00:49:01 UTC (rev 32999)
+++ scummvm/branches/gsoc2008-rtl/engines/saga/scene.cpp	2008-07-11 01:09:48 UTC (rev 33000)
@@ -315,7 +315,7 @@
 		break;
 	}
 
-	_vm->shutDown();
+	_vm->quitGame();
 	return;
 }
 

Modified: scummvm/branches/gsoc2008-rtl/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/saga/sfuncs.cpp	2008-07-11 00:49:01 UTC (rev 32999)
+++ scummvm/branches/gsoc2008-rtl/engines/saga/sfuncs.cpp	2008-07-11 01:09:48 UTC (rev 33000)
@@ -356,7 +356,7 @@
 	// exit the game. Known non-interactive demos are GID_ITE_MACDEMO1 and
 	// GID_ITE_WINDEMO1
 	if (_vm->getFeatures() & GF_NON_INTERACTIVE)
-		_vm->shutDown();
+		_vm->quitGame();
 }
 
 // Script function #6 (0x06) blocking
@@ -572,7 +572,7 @@
 	}
 
 	if (_vm->getGameType() == GType_ITE && sceneNumber < 0) {
-		_vm->shutDown();
+		_vm->quitGame();
 		return;
 	}
 


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