| 1 | diff -ur release-0-13-0/backends/events/default/default-events.h release-0-13-0--
|
|---|
| 2 | ps2/backends/events/default/default-events.h
|
|---|
| 3 | --- release-0-13-0/backends/events/default/default-events.h 2009-03-01 11:27:21..
|
|---|
| 4 | 000000000 -0500
|
|---|
| 5 | +++ release-0-13-0-ps2/backends/events/default/default-events.h 2009-03-01 11:455
|
|---|
| 6 | :03.000000000 -0500
|
|---|
| 7 | @@ -145,6 +145,7 @@
|
|---|
| 8 | virtual int shouldQuit() const { return _shouldQuit; }
|
|---|
| 9 | virtual int shouldRTL() const { return _shouldRTL; }
|
|---|
| 10 | virtual void resetRTL() { _shouldRTL = false; }
|
|---|
| 11 | + virtual void resetQuit() { _shouldQuit = false; }
|
|---|
| 12 |
|
|---|
| 13 | #ifdef ENABLE_KEYMAPPER
|
|---|
| 14 | virtual Common::Keymapper *getKeymapper() { return _keymapper; }
|
|---|
| 15 | diff -ur release-0-13-0/base/main.cpp release-0-13-0-ps2/base/main.cpp
|
|---|
| 16 | --- release-0-13-0/base/main.cpp 2009-03-01 11:27:21.000000000 -0500
|
|---|
| 17 | +++ release-0-13-0-ps2/base/main.cpp 2009-03-01 11:50:28.000000000 -0500
|
|---|
| 18 | @@ -322,11 +322,14 @@
|
|---|
| 19 | }
|
|---|
| 20 |
|
|---|
| 21 | // Quit unless an error occurred, or Return to launcher was requested
|
|---|
| 22 | +#ifndef __PLAYSTATION2__
|
|---|
| 23 | if (result == 0 && !g_system->getEventManager()->shouldRTL())
|
|---|
| 24 | break;
|
|---|
| 25 | -
|
|---|
| 26 | +#endif
|
|---|
| 27 | // Reset RTL flag in case we want to load another engine
|
|---|
| 28 | g_system->getEventManager()->resetRTL();
|
|---|
| 29 | + g_system->getEventManager()->resetQuit();
|
|---|
| 30 | + // TODO : restore mouse pointer properly !
|
|---|
| 31 |
|
|---|
| 32 | // Discard any command line options. It's unlikely that the user
|
|---|
| 33 | // wanted to apply them to *all* games ever launched.
|
|---|
| 34 | diff -ur release-0-13-0/common/events.h release-0-13-0-ps2/common/events.h
|
|---|
| 35 | --- release-0-13-0/common/events.h 2009-03-01 11:27:19.000000000 -0500
|
|---|
| 36 | +++ release-0-13-0-ps2/common/events.h 2009-03-01 12:57:24.000000000 -0500
|
|---|
| 37 | @@ -194,6 +194,7 @@
|
|---|
| 38 | * Used when we have returned to the launcher.
|
|---|
| 39 | */
|
|---|
| 40 | virtual void resetRTL() = 0;
|
|---|
| 41 | + virtual void resetQuit() = 0;
|
|---|
| 42 |
|
|---|
| 43 | // Optional: check whether a given key is currently pressed ????
|
|---|
| 44 | //virtual bool isKeyPressed(int keycode) = 0;
|
|---|
