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

[cpage88 at users.sourceforge.net]

Revision: 33671
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33671&view=rev
Author:   cpage88
Date:     2008-08-06 21:44:43 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
Added RTL feature to Tinsel

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/tinsel/inventory.cpp
    scummvm/branches/gsoc2008-rtl/engines/tinsel/tinlib.cpp
    scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.cpp
    scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.h

Modified: scummvm/branches/gsoc2008-rtl/engines/tinsel/inventory.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/tinsel/inventory.cpp	2008-08-06 20:58:02 UTC (rev 33670)
+++ scummvm/branches/gsoc2008-rtl/engines/tinsel/inventory.cpp	2008-08-06 21:44:43 UTC (rev 33671)
@@ -3073,7 +3073,7 @@
 					InvLoadGame();
 					break;
 				case IQUITGAME:
-					_vm->quitFlag = true;
+					_vm->quitGame();
 					break;
 				case CLOSEWIN:
 					KillInventory();

Modified: scummvm/branches/gsoc2008-rtl/engines/tinsel/tinlib.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/tinsel/tinlib.cpp	2008-08-06 20:58:02 UTC (rev 33670)
+++ scummvm/branches/gsoc2008-rtl/engines/tinsel/tinlib.cpp	2008-08-06 21:44:43 UTC (rev 33671)
@@ -1271,7 +1271,7 @@
 void quitgame(void) {
 	stopmidi();
 	stopsample();
-	_vm->quitFlag = true;
+	_vm->quitGame();
 }
 
 /**

Modified: scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.cpp	2008-08-06 20:58:02 UTC (rev 33670)
+++ scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.cpp	2008-08-06 21:44:43 UTC (rev 33671)
@@ -638,7 +638,6 @@
 	_mousePos.y = 0;
 	_keyHandler = NULL;
 	_dosPlayerDir = 0;
-	quitFlag = false;
 }
 
 TinselEngine::~TinselEngine() {
@@ -678,6 +677,8 @@
 #if 1
 	// FIXME: The following is taken from RestartGame().
 	// It may have to be adjusted a bit
+	CountOut = 1;
+
 	RebootCursor();
 	RebootDeadTags();
 	RebootMovers();
@@ -755,7 +756,7 @@
 
 	// Foreground loop
 
-	while (!quitFlag) {
+	while (!quit()) {
 		assert(_console);
 		if (_console->isAttached())
 			_console->onFrame();
@@ -789,7 +790,7 @@
 	// Write configuration
 	WriteConfig();
 
-	return 0;
+	return _eventMan->shouldRTL();
 }
 
 
@@ -819,10 +820,6 @@
 
 	// Handle the various kind of events
 	switch (event.type) {
-	case Common::EVENT_QUIT:
-		quitFlag = true;
-		break;
-
 	case Common::EVENT_LBUTTONDOWN:
 	case Common::EVENT_LBUTTONUP:
 	case Common::EVENT_RBUTTONDOWN:

Modified: scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.h	2008-08-06 20:58:02 UTC (rev 33670)
+++ scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.h	2008-08-06 21:44:43 UTC (rev 33671)
@@ -100,7 +100,6 @@
 	Common::Language getLanguage() const;
 	uint16 getVersion() const;
 	Common::Platform getPlatform() const;
-	bool quitFlag;
 
 	SoundManager *_sound;
 	MusicPlayer *_music;


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