[Scummvm-cvs-logs] SF.net SVN: scummvm:[39971] scummvm/branches/branch-0-13-0
sunmax at users.sourceforge.net
sunmax at users.sourceforge.net
Fri Apr 17 21:57:06 CEST 2009
Revision: 39971
http://scummvm.svn.sourceforge.net/scummvm/?rev=39971&view=rev
Author: sunmax
Date: 2009-04-17 19:57:06 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
Patched 0.13.1 to force RTL when compiled with -DFORCE_RTL,
mostly useful (and on poular request!) on PlayStation2 and
maybe other consoles.
We will later find a cleaner solution.
Modified Paths:
--------------
scummvm/branches/branch-0-13-0/backends/events/default/default-events.h
scummvm/branches/branch-0-13-0/backends/platform/ps2/Makefile.ps2
scummvm/branches/branch-0-13-0/base/main.cpp
scummvm/branches/branch-0-13-0/common/events.h
Modified: scummvm/branches/branch-0-13-0/backends/events/default/default-events.h
===================================================================
--- scummvm/branches/branch-0-13-0/backends/events/default/default-events.h 2009-04-17 16:18:08 UTC (rev 39970)
+++ scummvm/branches/branch-0-13-0/backends/events/default/default-events.h 2009-04-17 19:57:06 UTC (rev 39971)
@@ -145,6 +145,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/branches/branch-0-13-0/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/branches/branch-0-13-0/backends/platform/ps2/Makefile.ps2 2009-04-17 16:18:08 UTC (rev 39970)
+++ scummvm/branches/branch-0-13-0/backends/platform/ps2/Makefile.ps2 2009-04-17 19:57:06 UTC (rev 39971)
@@ -53,7 +53,7 @@
INCDIR = ../../../
# DEPDIR = .deps
-DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
+DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
Modified: scummvm/branches/branch-0-13-0/base/main.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/base/main.cpp 2009-04-17 16:18:08 UTC (rev 39970)
+++ scummvm/branches/branch-0-13-0/base/main.cpp 2009-04-17 19:57:06 UTC (rev 39971)
@@ -322,11 +322,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/branches/branch-0-13-0/common/events.h
===================================================================
--- scummvm/branches/branch-0-13-0/common/events.h 2009-04-17 16:18:08 UTC (rev 39970)
+++ scummvm/branches/branch-0-13-0/common/events.h 2009-04-17 19:57:06 UTC (rev 39971)
@@ -194,6 +194,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.
More information about the Scummvm-git-logs
mailing list