[Scummvm-git-logs] scummvm master -> ad382e62e6e864125e4bb43fdc2346283dd77d8e

[AndywinXp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
ad382e62e6 LASTEXPRESS: Tame some tight waiting loops pt.2


Commit: ad382e62e6e864125e4bb43fdc2346283dd77d8e
    https://github.com/scummvm/scummvm/commit/ad382e62e6e864125e4bb43fdc2346283dd77d8e
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-25T14:44:42+02:00

Commit Message:
LASTEXPRESS: Tame some tight waiting loops pt.2

Changed paths:
    engines/lastexpress/characters/kronos.cpp
    engines/lastexpress/characters/master.cpp
    engines/lastexpress/menu/menu.cpp


diff --git a/engines/lastexpress/characters/kronos.cpp b/engines/lastexpress/characters/kronos.cpp
index 42019b71445..fc352a759ab 100644
--- a/engines/lastexpress/characters/kronos.cpp
+++ b/engines/lastexpress/characters/kronos.cpp
@@ -847,7 +847,7 @@ void LogicManager::HAND_Kronos_Concert(HAND_PARAMS) {
 
 				while (dialogRunning("1919.LNK")) {
 					_engine->getSoundManager()->soundThread();
-					g_system->delayMillis(4);
+					_engine->waitForTimer(4);
 				}
 
 				playNIS(kEventCathWakingUp);
diff --git a/engines/lastexpress/characters/master.cpp b/engines/lastexpress/characters/master.cpp
index 75671f576b5..b24f415d246 100644
--- a/engines/lastexpress/characters/master.cpp
+++ b/engines/lastexpress/characters/master.cpp
@@ -405,7 +405,7 @@ void LogicManager::HAND_Master_FirstDream(HAND_PARAMS) {
 
 		while (dialogRunning("MUS008")) {
 			_engine->getSoundManager()->soundThread();
-			g_system->delayMillis(4);
+			_engine->waitForTimer(4);
 		}
 
 		_globals[kProgressField84] = 1;
@@ -1231,7 +1231,7 @@ void LogicManager::HAND_Master_SecondSleep(HAND_PARAMS) {
 
 		while (dialogRunning("MUS008")) {
 			_engine->getSoundManager()->soundThread();
-			g_system->delayMillis(4);
+			_engine->waitForTimer(4);
 		}
 
 		CONS_Master_StartPart2(0, 0, 0, 0);
@@ -2414,7 +2414,7 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
 
 		while (dialogRunning("MUS008")) {
 			_engine->getSoundManager()->soundThread();
-			g_system->delayMillis(4);
+			_engine->waitForTimer(4);
 		}
 
 		if (cathHasItem(kItemBomb)) {
diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp
index 2f006b7258a..a4f8c3e7b98 100644
--- a/engines/lastexpress/menu/menu.cpp
+++ b/engines/lastexpress/menu/menu.cpp
@@ -303,7 +303,7 @@ bool Menu::eggCursorAction(int8 action, int8 flags) {
 
 			while (_engine->getLogicManager()->dialogRunning("LIB046")) {
 				_engine->getSoundManager()->soundThread();
-				g_system->delayMillis(4);
+				_engine->waitForTimer(4);
 			}
 
 			g_system->delayMillis(334);