[Scummvm-cvs-logs] SF.net SVN: scummvm:[42403] scummvm/trunk

[sunmax at users.sourceforge.net]

Revision: 42403
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42403&view=rev
Author:   sunmax
Date:     2009-07-12 05:35:56 +0000 (Sun, 12 Jul 2009)

Log Message:
-----------
I am re-commiting the FORCE_RTL as a temporary solution
in trunk, so that trunk/1.0rc is au pair feature-wise
with 0.13.x.

Modified Paths:
--------------
    scummvm/trunk/backends/events/default/default-events.h
    scummvm/trunk/base/main.cpp
    scummvm/trunk/common/events.h

Modified: scummvm/trunk/backends/events/default/default-events.h
===================================================================
--- scummvm/trunk/backends/events/default/default-events.h	2009-07-12 05:34:46 UTC (rev 42402)
+++ scummvm/trunk/backends/events/default/default-events.h	2009-07-12 05:35:56 UTC (rev 42403)
@@ -143,6 +143,9 @@
 	virtual int shouldQuit() const { return _shouldQuit; }
 	virtual int shouldRTL() const { return _shouldRTL; }
 	virtual void resetRTL() { _shouldRTL = false; }
+#ifdef FORCE_RTL
+	virtual void resetQuit() { _shouldQuit = false; }
+#endif
 
 #ifdef ENABLE_KEYMAPPER
 	virtual Common::Keymapper *getKeymapper() { return _keymapper; }

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2009-07-12 05:34:46 UTC (rev 42402)
+++ scummvm/trunk/base/main.cpp	2009-07-12 05:35:56 UTC (rev 42403)
@@ -382,11 +382,15 @@
 			}
 
 			// Quit unless an error occurred, or Return to launcher was requested
+			#ifndef FORCE_RTL
 			if (result == 0 && !g_system->getEventManager()->shouldRTL())
 				break;
-
+			#endif
 			// Reset RTL flag in case we want to load another engine
 			g_system->getEventManager()->resetRTL();
+			#ifdef FORCE_RTL
+			g_system->getEventManager()->resetQuit();
+			#endif
 
 			// Discard any command line options. It's unlikely that the user
 			// wanted to apply them to *all* games ever launched.

Modified: scummvm/trunk/common/events.h
===================================================================
--- scummvm/trunk/common/events.h	2009-07-12 05:34:46 UTC (rev 42402)
+++ scummvm/trunk/common/events.h	2009-07-12 05:35:56 UTC (rev 42403)
@@ -195,7 +195,9 @@
 	 * Used when we have returned to the launcher.
 	 */
 	virtual void resetRTL() = 0;
-
+#ifdef FORCE_RTL
+	virtual void resetQuit() = 0;
+#endif
 	// Optional: check whether a given key is currently pressed ????
 	//virtual bool isKeyPressed(int keycode) = 0;
 


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