aboutsummaryrefslogtreecommitdiff
path: root/engines/sky/control.cpp
diff options
context:
space:
mode:
authorChristopher Page2008-06-25 03:17:01 +0000
committerChristopher Page2008-06-25 03:17:01 +0000
commit27c427add299399a71fe96f591690e589e35c031 (patch)
tree9282a0966c5ac5fb55158ed88a4582f6abf441ae /engines/sky/control.cpp
parent7d0eb4f4f069beea93f970b2918ad6cf65c2eaa7 (diff)
downloadscummvm-rg350-27c427add299399a71fe96f591690e589e35c031.tar.gz
scummvm-rg350-27c427add299399a71fe96f591690e589e35c031.tar.bz2
scummvm-rg350-27c427add299399a71fe96f591690e589e35c031.zip
Scumm and sky now use the new _quit flag
svn-id: r32775
Diffstat (limited to 'engines/sky/control.cpp')
-rw-r--r--engines/sky/control.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 53169402e1..5955c851f6 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -492,7 +492,7 @@ void Control::doControlPanel(void) {
_curButtonText = 0;
uint16 clickRes = 0;
- while (!quitPanel && !SkyEngine::_systemVars.quitGame) {
+ while (!quitPanel && !g_engine->_quit) {
_text->drawToScreen(WITH_MASK);
_system->updateScreen();
_mouseClicked = false;
@@ -524,7 +524,7 @@ void Control::doControlPanel(void) {
}
memset(_screenBuf, 0, GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
_system->copyRectToScreen(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
- if (!SkyEngine::_systemVars.quitGame)
+ if (!g_engine->_quit)
_system->updateScreen();
_skyScreen->forceRefresh();
_skyScreen->setPaletteEndian((uint8 *)_skyCompact->fetchCpt(SkyEngine::_systemVars.currentPalette));
@@ -603,7 +603,7 @@ uint16 Control::handleClick(ConResource *pButton) {
case QUIT_TO_DOS:
animClick(pButton);
if (getYesNo(quitDos))
- SkyEngine::_systemVars.quitGame = true;
+ g_engine->_quit = true;
return 0;
default:
error("Control::handleClick: unknown routine: %X",pButton->_onClick);
@@ -875,7 +875,7 @@ uint16 Control::saveRestorePanel(bool allowSave) {
bool refreshNames = true;
bool refreshAll = true;
uint16 clickRes = 0;
- while (!quitPanel && !SkyEngine::_systemVars.quitGame) {
+ while (!quitPanel && !g_engine->_quit) {
clickRes = 0;
if (refreshNames || refreshAll) {
if (refreshAll) {
@@ -1547,7 +1547,7 @@ void Control::delay(unsigned int amount) {
_mouseWheel = 1;
break;
case Common::EVENT_QUIT:
- SkyEngine::_systemVars.quitGame = true;
+ g_engine->_quit = true;
break;
default:
break;