[Scummvm-cvs-logs] SF.net SVN: scummvm: [32954] scummvm/branches/gsoc2008-rtl/engines/cine
cpage88 at users.sourceforge.net
cpage88 at users.sourceforge.net
Tue Jul 8 01:47:39 CEST 2008
Revision: 32954
http://scummvm.svn.sourceforge.net/scummvm/?rev=32954&view=rev
Author: cpage88
Date: 2008-07-07 16:47:39 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
CINE works with the new GMM implementation
Modified Paths:
--------------
scummvm/branches/gsoc2008-rtl/engines/cine/anim.cpp
scummvm/branches/gsoc2008-rtl/engines/cine/cine.cpp
scummvm/branches/gsoc2008-rtl/engines/cine/main_loop.cpp
scummvm/branches/gsoc2008-rtl/engines/cine/prc.cpp
scummvm/branches/gsoc2008-rtl/engines/cine/various.cpp
Modified: scummvm/branches/gsoc2008-rtl/engines/cine/anim.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/cine/anim.cpp 2008-07-07 23:24:12 UTC (rev 32953)
+++ scummvm/branches/gsoc2008-rtl/engines/cine/anim.cpp 2008-07-07 23:47:39 UTC (rev 32954)
@@ -28,6 +28,7 @@
*/
#include "common/endian.h"
+#include "common/events.h"
#include "common/stream.h"
#include "cine/cine.h"
@@ -731,7 +732,7 @@
loadSeq(resourceName, -1);
return;
} else if (strstr(resourceName, "ECHEC")) { // Echec (French) means failure
- g_cine->_quit = 1;
+ g_system->getEventManager()->pushEvent(Common::EVENT_QUIT);
return;
}
Modified: scummvm/branches/gsoc2008-rtl/engines/cine/cine.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/cine/cine.cpp 2008-07-07 23:24:12 UTC (rev 32953)
+++ scummvm/branches/gsoc2008-rtl/engines/cine/cine.cpp 2008-07-07 23:47:39 UTC (rev 32954)
@@ -103,7 +103,7 @@
delete[] page3Raw;
delete g_sound;
- return _rtl;
+ return _eventMan->shouldRTL();
}
Modified: scummvm/branches/gsoc2008-rtl/engines/cine/main_loop.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/cine/main_loop.cpp 2008-07-07 23:24:12 UTC (rev 32953)
+++ scummvm/branches/gsoc2008-rtl/engines/cine/main_loop.cpp 2008-07-07 23:47:39 UTC (rev 32954)
@@ -62,7 +62,7 @@
case Common::EVENT_MOUSEMOVE:
break;
case Common::EVENT_QUIT:
- g_cine->_quit = 1;
+ g_system->getEventManager()->pushEvent(Common::EVENT_QUIT);
break;
case Common::EVENT_KEYDOWN:
switch (event.kbd.keycode) {
@@ -292,7 +292,7 @@
if ("quit"[menuCommandLen] == (char)di) {
++menuCommandLen;
if (menuCommandLen == 4) {
- g_cine->_quit = 1;
+ g_system->getEventManager()->pushEvent(Common::EVENT_QUIT);
}
} else {
menuCommandLen = 0;
@@ -301,7 +301,7 @@
manageEvents();
- } while (!g_cine->_quit && _danKeysPressed != 7);
+ } while (!_eventMan->shouldQuit() && _danKeysPressed != 7);
hideMouse();
g_sound->stopMusic();
Modified: scummvm/branches/gsoc2008-rtl/engines/cine/prc.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/cine/prc.cpp 2008-07-07 23:24:12 UTC (rev 32953)
+++ scummvm/branches/gsoc2008-rtl/engines/cine/prc.cpp 2008-07-07 23:47:39 UTC (rev 32954)
@@ -25,6 +25,7 @@
#include "common/endian.h"
+#include "common/events.h"
#include "cine/cine.h"
#include "cine/various.h"
@@ -53,7 +54,7 @@
// This is copy protection. Used to hang the machine
if (!scumm_stricmp(pPrcName, "L201.ANI")) {
- g_cine->_quit = 1;
+ g_system->getEventManager()->pushEvent(Common::EVENT_QUIT);
return;
}
Modified: scummvm/branches/gsoc2008-rtl/engines/cine/various.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/cine/various.cpp 2008-07-07 23:24:12 UTC (rev 32953)
+++ scummvm/branches/gsoc2008-rtl/engines/cine/various.cpp 2008-07-07 23:47:39 UTC (rev 32954)
@@ -756,7 +756,7 @@
{
getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) {
- _quit = 1;
+ g_system->getEventManager()->pushEvent(Common::EVENT_QUIT);
}
break;
}
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