aboutsummaryrefslogtreecommitdiff
path: root/engines/sky/control.cpp
diff options
context:
space:
mode:
authorMax Horn2008-09-30 12:27:38 +0000
committerMax Horn2008-09-30 12:27:38 +0000
commit9b160804ab8878b55efb032fb62ee359ab97f848 (patch)
treeaa0ac6d0aec815de5f2368acc00971948cf3fa0b /engines/sky/control.cpp
parent87917e06d94e36c483011deaf1eb4a5dba6eeb97 (diff)
downloadscummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.tar.gz
scummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.tar.bz2
scummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.zip
Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
Diffstat (limited to 'engines/sky/control.cpp')
-rw-r--r--engines/sky/control.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 8699c893e4..ed2902fe47 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -496,7 +496,7 @@ void Control::doControlPanel(void) {
_curButtonText = 0;
uint16 clickRes = 0;
- while (!quitPanel && !g_engine->quit()) {
+ while (!quitPanel && !g_engine->shouldQuit()) {
_text->drawToScreen(WITH_MASK);
_system->updateScreen();
_mouseClicked = false;
@@ -528,7 +528,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 (!g_engine->quit())
+ if (!g_engine->shouldQuit())
_system->updateScreen();
_skyScreen->forceRefresh();
_skyScreen->setPaletteEndian((uint8 *)_skyCompact->fetchCpt(SkyEngine::_systemVars.currentPalette));
@@ -879,7 +879,7 @@ uint16 Control::saveRestorePanel(bool allowSave) {
bool refreshNames = true;
bool refreshAll = true;
uint16 clickRes = 0;
- while (!quitPanel && !g_engine->quit()) {
+ while (!quitPanel && !g_engine->shouldQuit()) {
clickRes = 0;
if (refreshNames || refreshAll) {
if (refreshAll) {