[Scummvm-cvs-logs] SF.net SVN: scummvm: [32795] scummvm/branches/gsoc2008-rtl/engines/touche
cpage88 at users.sourceforge.net
cpage88 at users.sourceforge.net
Thu Jun 26 07:04:42 CEST 2008
Revision: 32795
http://scummvm.svn.sourceforge.net/scummvm/?rev=32795&view=rev
Author: cpage88
Date: 2008-06-25 22:04:42 -0700 (Wed, 25 Jun 2008)
Log Message:
-----------
Touche now uses the new _quit flag
Modified Paths:
--------------
scummvm/branches/gsoc2008-rtl/engines/touche/menu.cpp
scummvm/branches/gsoc2008-rtl/engines/touche/saveload.cpp
scummvm/branches/gsoc2008-rtl/engines/touche/touche.cpp
Modified: scummvm/branches/gsoc2008-rtl/engines/touche/menu.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/touche/menu.cpp 2008-06-26 04:54:29 UTC (rev 32794)
+++ scummvm/branches/gsoc2008-rtl/engines/touche/menu.cpp 2008-06-26 05:04:42 UTC (rev 32795)
@@ -297,7 +297,7 @@
menuData->quit = true;
break;
case kActionQuitGame:
- _flagsTable[611] = 1;
+ _quit = 1;
menuData->quit = true;
break;
case kActionTextOnly:
@@ -398,7 +398,7 @@
case Common::EVENT_QUIT:
menuData.quit = true;
menuData.exit = true;
- _flagsTable[611] = 1;
+ _quit = 1;
break;
case Common::EVENT_LBUTTONDOWN:
button = menuData.findButtonUnderCursor(event.mouse.x, event.mouse.y);
@@ -433,8 +433,8 @@
_system->delayMillis(10);
}
_fullRedrawCounter = 2;
- if (!menuData.exit && _flagsTable[611] != 0) {
- _flagsTable[611] = displayQuitDialog();
+ if (!menuData.exit && _quit != 0) {
+ _quit = displayQuitDialog();
}
}
}
Modified: scummvm/branches/gsoc2008-rtl/engines/touche/saveload.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/touche/saveload.cpp 2008-06-26 04:54:29 UTC (rev 32794)
+++ scummvm/branches/gsoc2008-rtl/engines/touche/saveload.cpp 2008-06-26 05:04:42 UTC (rev 32795)
@@ -295,7 +295,7 @@
if (stream->readUint32LE() != saveLoadEndMarker) {
warning("Corrupted gamestate data");
// if that ever happens, exit the game
- _flagsTable[611] = 1;
+ _quit = 1;
}
_flagsTable[614] = roomOffsX;
_flagsTable[615] = roomOffsY;
Modified: scummvm/branches/gsoc2008-rtl/engines/touche/touche.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/touche/touche.cpp 2008-06-26 04:54:29 UTC (rev 32794)
+++ scummvm/branches/gsoc2008-rtl/engines/touche/touche.cpp 2008-06-26 05:04:42 UTC (rev 32795)
@@ -115,7 +115,7 @@
res_deallocateTables();
res_closeDataFile();
- return 0;
+ return _rtl;
}
void ToucheEngine::restart() {
@@ -262,7 +262,7 @@
}
uint32 frameTimeStamp = _system->getMillis();
- for (uint32 cycleCounter = 0; _flagsTable[611] == 0; ++cycleCounter) {
+ for (uint32 cycleCounter = 0; _quit == 0; ++cycleCounter) {
if ((cycleCounter % 3) == 0) {
runCycle();
}
@@ -292,7 +292,7 @@
while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_QUIT:
- _flagsTable[611] = 1;
+ _quit = 1;
break;
case Common::EVENT_KEYDOWN:
if (!handleKeyEvents) {
@@ -301,7 +301,7 @@
_flagsTable[600] = event.kbd.keycode;
if (event.kbd.keycode == Common::KEYCODE_ESCAPE) {
if (_displayQuitDialog) {
- _flagsTable[611] = displayQuitDialog();
+ _quit = displayQuitDialog();
}
} else if (event.kbd.keycode == Common::KEYCODE_F5) {
if (_flagsTable[618] == 0 && !_hideInventoryTexts) {
@@ -1832,7 +1832,7 @@
_menuRedrawCounter = 2;
Common::Rect rect(0, y, kScreenWidth, y + h);
i = -1;
- while (_inp_rightMouseButtonPressed && _flagsTable[611] == 0) {
+ while (_inp_rightMouseButtonPressed && _quit == 0) {
Common::Point mousePos = getMousePos();
if (rect.contains(mousePos)) {
int c = (mousePos.y - y) / kTextHeight;
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