aboutsummaryrefslogtreecommitdiff
path: root/engines/lure
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lure')
-rw-r--r--engines/lure/events.cpp6
-rw-r--r--engines/lure/fights.cpp2
-rw-r--r--engines/lure/game.cpp6
-rw-r--r--engines/lure/intro.cpp6
-rw-r--r--engines/lure/lure.cpp4
-rw-r--r--engines/lure/menu.cpp4
-rw-r--r--engines/lure/scripts.cpp2
-rw-r--r--engines/lure/surface.cpp12
8 files changed, 21 insertions, 21 deletions
diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp
index e244f69097..5ca82a9be4 100644
--- a/engines/lure/events.cpp
+++ b/engines/lure/events.cpp
@@ -141,9 +141,9 @@ void Mouse::waitForRelease() {
LureEngine &engine = LureEngine::getReference();
do {
- while (e.pollEvent() && !engine.quit()) ;
+ while (e.pollEvent() && !engine.shouldQuit()) ;
g_system->delayMillis(20);
- } while (!engine.quit() && (lButton() || rButton() || mButton()));
+ } while (!engine.shouldQuit() && (lButton() || rButton() || mButton()));
}
/*--------------------------------------------------------------------------*/
@@ -211,7 +211,7 @@ bool Events::interruptableDelay(uint32 milliseconds) {
uint32 delayCtr = g_system->getMillis() + milliseconds;
while (g_system->getMillis() < delayCtr) {
- if (engine.quit()) return true;
+ if (engine.shouldQuit()) return true;
if (events.pollEvent()) {
if (((events.type() == Common::EVENT_KEYDOWN) && (events.event().kbd.ascii != 0)) ||
diff --git a/engines/lure/fights.cpp b/engines/lure/fights.cpp
index 51fce850e6..6ff7339c02 100644
--- a/engines/lure/fights.cpp
+++ b/engines/lure/fights.cpp
@@ -117,7 +117,7 @@ void FightsManager::fightLoop() {
uint32 timerVal = g_system->getMillis();
// Loop for the duration of the battle
- while (!engine.quit() && (playerFight.fwhits != GENERAL_MAGIC_ID)) {
+ while (!engine.shouldQuit() && (playerFight.fwhits != GENERAL_MAGIC_ID)) {
checkEvents();
if (g_system->getMillis() > timerVal + GAME_FRAME_DELAY) {
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp
index 479877f229..cf3d4ac125 100644
--- a/engines/lure/game.cpp
+++ b/engines/lure/game.cpp
@@ -151,7 +151,7 @@ void Game::execute() {
bool initialRestart = true;
- while (!engine.quit()) {
+ while (!engine.shouldQuit()) {
if ((_state & GS_RESTART) != 0) {
res.reset();
@@ -171,7 +171,7 @@ void Game::execute() {
mouse.cursorOn();
// Main game loop
- while (!engine.quit() && ((_state & GS_RESTART) == 0)) {
+ while (!engine.shouldQuit() && ((_state & GS_RESTART) == 0)) {
// If time for next frame, allow everything to update
if (system.getMillis() > timerVal + GAME_FRAME_DELAY) {
timerVal = system.getMillis();
@@ -1025,7 +1025,7 @@ bool Game::getYN() {
}
g_system->delayMillis(10);
- } while (!engine.quit() && !breakFlag);
+ } while (!engine.shouldQuit() && !breakFlag);
screen.update();
if (!vKbdFlag)
diff --git a/engines/lure/intro.cpp b/engines/lure/intro.cpp
index b4cbf4a833..a4676984c6 100644
--- a/engines/lure/intro.cpp
+++ b/engines/lure/intro.cpp
@@ -60,13 +60,13 @@ bool Introduction::showScreen(uint16 screenId, uint16 paletteId, uint16 delaySiz
screen.update();
Palette p(paletteId);
- if (LureEngine::getReference().quit()) return true;
+ if (LureEngine::getReference().shouldQuit()) return true;
if (isEGA) screen.setPalette(&p);
else screen.paletteFadeIn(&p);
bool result = interruptableDelay(delaySize);
- if (LureEngine::getReference().quit()) return true;
+ if (LureEngine::getReference().shouldQuit()) return true;
if (!isEGA)
screen.paletteFadeOut();
@@ -84,7 +84,7 @@ bool Introduction::interruptableDelay(uint32 milliseconds) {
if (events.interruptableDelay(milliseconds)) {
if (events.type() == Common::EVENT_KEYDOWN)
return events.event().kbd.keycode == 27;
- else if (LureEngine::getReference().quit())
+ else if (LureEngine::getReference().shouldQuit())
return true;
else if (events.type() == Common::EVENT_LBUTTONDOWN)
return false;
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index 8cd76cbc73..23737e2f77 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -136,7 +136,7 @@ int LureEngine::go() {
CopyProtectionDialog *dialog = new CopyProtectionDialog();
bool result = dialog->show();
delete dialog;
- if (quit())
+ if (shouldQuit())
return 0;
if (!result)
@@ -153,7 +153,7 @@ int LureEngine::go() {
}
// Play the game
- if (!quit()) {
+ if (!shouldQuit()) {
// Play the game
Sound.loadSection(Sound.isRoland() ? ROLAND_MAIN_SOUND_RESOURCE_ID : ADLIB_MAIN_SOUND_RESOURCE_ID);
gameInstance->execute();
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp
index 562f54da20..112e6116a2 100644
--- a/engines/lure/menu.cpp
+++ b/engines/lure/menu.cpp
@@ -131,7 +131,7 @@ uint8 Menu::execute() {
while (mouse.lButton() || mouse.rButton()) {
while (events.pollEvent()) {
- if (engine.quit()) return MENUITEM_NONE;
+ if (engine.shouldQuit()) return MENUITEM_NONE;
if (mouse.y() < MENUBAR_Y_SIZE) {
MenuRecord *p = getMenuAt(mouse.x());
@@ -547,7 +547,7 @@ uint16 PopupMenu::Show(int numEntries, const char *actions[]) {
}
while (e.pollEvent()) {
- if (engine.quit()) {
+ if (engine.shouldQuit()) {
selectedIndex = 0xffff;
goto bail_out;
diff --git a/engines/lure/scripts.cpp b/engines/lure/scripts.cpp
index 495f8046bb..9b073fc1bc 100644
--- a/engines/lure/scripts.cpp
+++ b/engines/lure/scripts.cpp
@@ -221,7 +221,7 @@ void Script::endgameSequence(uint16 v1, uint16 v2, uint16 v3) {
anim->show();
if (!events.interruptableDelay(30000)) {
// No key yet pressed, so keep waiting
- while (Sound.musicInterface_CheckPlaying(6) && !engine.quit()) {
+ while (Sound.musicInterface_CheckPlaying(6) && !engine.shouldQuit()) {
if (events.interruptableDelay(20))
break;
}
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp
index 23cc9043cf..01746f39d5 100644
--- a/engines/lure/surface.cpp
+++ b/engines/lure/surface.cpp
@@ -534,7 +534,7 @@ bool Surface::getString(Common::String &line, int maxSize, bool isNumeric, bool
// Loop until the input string changes
refreshFlag = false;
while (!refreshFlag && !abortFlag) {
- abortFlag = engine.quit();
+ abortFlag = engine.shouldQuit();
if (abortFlag) break;
while (events.pollEvent()) {
@@ -976,7 +976,7 @@ bool SaveRestoreDialog::show(bool saveDialog) {
// Provide highlighting of lines to select a save slot
while (!abortFlag && !(mouse.lButton() && (selectedLine != -1))
&& !mouse.rButton() && !mouse.mButton()) {
- abortFlag = engine.quit();
+ abortFlag = engine.shouldQuit();
if (abortFlag) break;
while (events.pollEvent()) {
@@ -1179,7 +1179,7 @@ bool RestartRestoreDialog::show() {
// Event loop for making selection
bool buttonPressed = false;
- while (!engine.quit()) {
+ while (!engine.shouldQuit()) {
// Handle events
while (events.pollEvent()) {
if ((events.type() == Common::EVENT_LBUTTONDOWN) && (highlightedButton != -1)) {
@@ -1231,7 +1231,7 @@ bool RestartRestoreDialog::show() {
Sound.killSounds();
- if (!restartFlag && !engine.quit()) {
+ if (!restartFlag && !engine.shouldQuit()) {
// Need to show Restore game dialog
if (!SaveRestoreDialog::show(false))
// User cancelled, so fall back on Restart
@@ -1351,7 +1351,7 @@ bool CopyProtectionDialog::show() {
// Clear any prior try
_charIndex = 0;
- while (!engine.quit()) {
+ while (!engine.shouldQuit()) {
while (events.pollEvent() && (_charIndex < 4)) {
if (events.type() == Common::EVENT_KEYDOWN) {
if ((events.event().kbd.keycode == Common::KEYCODE_BACKSPACE) && (_charIndex > 0)) {
@@ -1385,7 +1385,7 @@ bool CopyProtectionDialog::show() {
break;
}
- if (engine.quit())
+ if (engine.shouldQuit())
return false;
// At this point, two page numbers have been entered - validate them
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 05:35:19 +0000