[Scummvm-git-logs] scummvm master -> 48c346523faef1d44e5a7d10a549101a92e8691a

[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:
48c346523f LASTEXPRESS: Fix #16029


Commit: 48c346523faef1d44e5a7d10a549101a92e8691a
    https://github.com/scummvm/scummvm/commit/48c346523faef1d44e5a7d10a549101a92e8691a
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-18T14:56:38+02:00

Commit Message:
LASTEXPRESS: Fix #16029

"LASTEXPRESS: DEMO: Demo reel does not play when idle at Egg screen"

Changed paths:
    engines/lastexpress/game/credits.cpp
    engines/lastexpress/lastexpress.h
    engines/lastexpress/menu/menu.cpp


diff --git a/engines/lastexpress/game/credits.cpp b/engines/lastexpress/game/credits.cpp
index 4e06179976d..a184db697fa 100644
--- a/engines/lastexpress/game/credits.cpp
+++ b/engines/lastexpress/game/credits.cpp
@@ -544,14 +544,14 @@ bool LastExpressEngine::demoEnding(bool wonGame) {
 	}
 
 	getGraphicsManager()->setMouseDrawable(savedMouseState);
-	getMenu()->setEggTimerDelta(2700);
+	getMenu()->setEggTimerDelta(DEMO_TIMEOUT);
 
 	return exitFlag;
 }
 
 void LastExpressEngine::demoEndingMouse(Event *event) {
 	if (event->flags || ABS<int32>((int32)event->x - _cursorX) > 5 || ABS<int32>((int32)event->y - _cursorY) > 5)
-		getMenu()->setEggTimerDelta(2700);
+		getMenu()->setEggTimerDelta(DEMO_TIMEOUT);
 }
 
 void LastExpressEngine::demoEndingTimer(Event *event) {
diff --git a/engines/lastexpress/lastexpress.h b/engines/lastexpress/lastexpress.h
index ffcd128e7c0..878dd844199 100644
--- a/engines/lastexpress/lastexpress.h
+++ b/engines/lastexpress/lastexpress.h
@@ -507,6 +507,8 @@ typedef struct NisEvents {
 
 #define PAGE_SIZE  0x800
 
+#define DEMO_TIMEOUT 2700
+
 typedef uint16 PixMap;
 
 class LastExpressEngine : public Engine {
diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp
index 32928eb8757..aa9a7f1f328 100644
--- a/engines/lastexpress/menu/menu.cpp
+++ b/engines/lastexpress/menu/menu.cpp
@@ -36,7 +36,7 @@ Menu::Menu(LastExpressEngine *engine) {
 	_engine = engine;
 
 	if (_engine->isDemo())
-		_eggTimerDelta = 2700;
+		_eggTimerDelta = DEMO_TIMEOUT;
 }
 
 void Menu::doEgg(bool doSaveGame, int type, int32 time) {
@@ -44,7 +44,7 @@ void Menu::doEgg(bool doSaveGame, int type, int32 time) {
 		_isShowingMenu = true;
 
 		if (_engine->isDemo())
-			_eggTimerDelta = 2700;
+			_eggTimerDelta = DEMO_TIMEOUT;
 
 		_engine->getOtisManager()->wipeAllGSysInfo();
 
@@ -136,7 +136,7 @@ void Menu::eggFree() {
 
 void Menu::eggMouse(Event *event) {
 	if (_engine->isDemo())
-		_eggTimerDelta = 2700;
+		_eggTimerDelta = DEMO_TIMEOUT;
 
 	if (_engine->getGraphicsManager()->canDrawMouse()) {
 		bool redrawMouse = true;
@@ -207,7 +207,7 @@ void Menu::eggTimer(Event *event) {
 		_moveClockHandsFlag = false;
 	}
 
-	if (!_eggTimerDelta--) {
+	if (!--_eggTimerDelta) {
 		if (_engine->isDemo()) {
 			endEgg();