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

[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:
b507fe2e0b LASTEXPRESS: Relabel function to match original name


Commit: b507fe2e0bde92f9b22893cebf6a3f267556ff59
    https://github.com/scummvm/scummvm/commit/b507fe2e0bde92f9b22893cebf6a3f267556ff59
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-18T22:52:02+02:00

Commit Message:
LASTEXPRESS: Relabel function to match original name

Changed paths:
    engines/lastexpress/game/events.cpp
    engines/lastexpress/game/events.h
    engines/lastexpress/game/logic.cpp
    engines/lastexpress/menu/menu.cpp


diff --git a/engines/lastexpress/game/events.cpp b/engines/lastexpress/game/events.cpp
index 7c400649aab..1599ddfb08e 100644
--- a/engines/lastexpress/game/events.cpp
+++ b/engines/lastexpress/game/events.cpp
@@ -223,7 +223,7 @@ void MessageManager::forceMessage(Message *msg) {
 		(_engine->getLogicManager()->*_messageHandles[msg->receiver])(msg);
 }
 
-void MessageManager::reset() {
+void MessageManager::clearMessageQueue() {
 	Common::StackLock lock(*_engine->_soundMutex);
 	_numMsgsInQueue = 0;
 	_nextMsgIndex = 0;
diff --git a/engines/lastexpress/game/events.h b/engines/lastexpress/game/events.h
index 5d2ae5b8aa4..9f68fc6dda9 100644
--- a/engines/lastexpress/game/events.h
+++ b/engines/lastexpress/game/events.h
@@ -98,7 +98,7 @@ public:
 	void flush();
 	void flushTime();
 	void forceMessage(Message *msg);
-	void reset();
+	void clearMessageQueue();
 	void clearEventQueue();
 	void clearClickEvents();
 	void saveMessages(CVCRFile *file);
diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp
index 86541ec1c63..7a2b0745bec 100644
--- a/engines/lastexpress/game/logic.cpp
+++ b/engines/lastexpress/game/logic.cpp
@@ -116,7 +116,7 @@ void LogicManager::endGame(int type, int value, int sceneIndex, bool showScene)
 	_engine->getOtisManager()->wipeAllGSysInfo();
 
 	_engine->_navigationEngineIsRunning = false;
-	_engine->getMessageManager()->reset();
+	_engine->getMessageManager()->clearMessageQueue();
 	_engine->_stopUpdatingCharacters = false;
 
 	if (showScene) {
@@ -163,7 +163,7 @@ void LogicManager::winGame() {
 	if (_engine->isDemo() && _engine->_navigationEngineIsRunning) {
 		_engine->getSoundManager()->endAmbient();
 		_engine->getOtisManager()->wipeAllGSysInfo();
-		_engine->getMessageManager()->reset();
+		_engine->getMessageManager()->clearMessageQueue();
 		_engine->_stopUpdatingCharacters = true;
 		_engine->demoEnding(true);
 		_engine->getMenu()->doEgg(false, 0, 0);
@@ -172,7 +172,7 @@ void LogicManager::winGame() {
 		playNIS(kEventFinalSequence);
 		_engine->doCredits();
 		_engine->getOtisManager()->wipeAllGSysInfo();
-		_engine->getMessageManager()->reset();
+		_engine->getMessageManager()->clearMessageQueue();
 		_engine->_stopUpdatingCharacters = true;
 		_engine->getMenu()->doEgg(false, 0, 0);
 	}
diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp
index aa9a7f1f328..bc132dd2737 100644
--- a/engines/lastexpress/menu/menu.cpp
+++ b/engines/lastexpress/menu/menu.cpp
@@ -359,7 +359,7 @@ bool Menu::eggCursorAction(int8 action, int8 flags) {
 			_engine->getLogicManager()->loadTrain(whichCD);
 			setSprite(0, -1, true);
 			_engine->getSoundManager()->playSoundFile("LIB046.SND", 16, 0, 0);
-			_engine->getMessageManager()->reset();
+			_engine->getMessageManager()->clearMessageQueue();
 			endEgg();
 
 			Slot *slot = _engine->getSoundManager()->_soundCache;
@@ -410,7 +410,7 @@ bool Menu::eggCursorAction(int8 action, int8 flags) {
 			setSprite(0, -1, true);
 
 			_engine->getLogicManager()->playDialog(0, "LIB046", -1, 0);
-			_engine->getMessageManager()->reset();
+			_engine->getMessageManager()->clearMessageQueue();
 			endEgg();
 
 			if (!_engine->_currentSavePoint) {