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

[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:
b1e5905517 LASTEXPRESS: Minor clean-up


Commit: b1e5905517cfa5a1c515cb491e47675963fbef34
    https://github.com/scummvm/scummvm/commit/b1e5905517cfa5a1c515cb491e47675963fbef34
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-27T21:26:23+02:00

Commit Message:
LASTEXPRESS: Minor clean-up

Changed paths:
    engines/lastexpress/game/action.cpp
    engines/lastexpress/game/navigation.cpp
    engines/lastexpress/sound/sound.cpp


diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp
index 8e0ea0ef35b..baa837dcc0d 100644
--- a/engines/lastexpress/game/action.cpp
+++ b/engines/lastexpress/game/action.cpp
@@ -99,7 +99,7 @@ int LogicManager::findCursor(Link *link) {
 
 		break;
 	case kActionRattle:
-		if ((_activeItem == kItemKey && !_doors[kItemMatchBox].status) || (_doors[kItemMatchBox].status == 1 && cathHasItem(kItemKey) && (_activeItem == kItemBriefcase || _activeItem == kItemFirebird))) {
+		if ((_activeItem == kItemKey && !_doors[1].status) || (_doors[1].status == 1 && cathHasItem(kItemKey) && (_activeItem == kItemBriefcase || _activeItem == kItemFirebird))) {
 			result = _items[kItemKey].mnum;
 		} else {
 			if (link->param1 >= 128) {
@@ -1008,7 +1008,7 @@ void LogicManager::doAction(Link *link) {
 		if (_engine->isDemo())
 			break;
 
-		if ((!_doneNIS[kEventCathLookOutsideWindowDay] && !_doneNIS[kEventCathLookOutsideWindowNight] && getModel(1) != 1) || !_globals[kGlobalTrainIsRunning] || (link->param1 == 45 && (inComp(kCharacterRebecca, kCarRedSleeping, 4840) || _doors[kObjectOutsideBetweenCompartments].status != 2)) || _activeItem == kItemBriefcase || _activeItem == kItemFirebird) {
+		if ((!_doneNIS[kEventCathLookOutsideWindowDay] && !_doneNIS[kEventCathLookOutsideWindowNight] && getModel(1) != 1) || !_globals[kGlobalTrainIsRunning] || (link->param1 == 45 && (inComp(kCharacterRebecca, kCarRedSleeping, 4840) || _doors[44].status != 2)) || _activeItem == kItemBriefcase || _activeItem == kItemFirebird) {
 			if (link->param1 == 9 || (link->param1 >= 44 && link->param1 <= 45)) {
 				if (isNight()) {
 					playNIS(kEventCathLookOutsideWindowNight);
@@ -1417,7 +1417,7 @@ void LogicManager::doAction(Link *link) {
 					setModel(1, link->param2);
 				}
 
-				if (_doors[kItemMatchBox].status != 1 && _doors[kItemMatchBox].status != 3 && _activeItem != kItemKey) {
+				if (_doors[1].status != 1 && _doors[1].status != 3 && _activeItem != kItemKey) {
 					if (!_globals[kGlobalFoundCorpse]) {
 						_engine->getVCR()->writeSavePoint(1, kCharacterCath, 0);
 						playDialog(kCharacterCath, "LIB014", -1, 0);
@@ -1474,7 +1474,7 @@ void LogicManager::doAction(Link *link) {
 					_engine->getGraphicsManager()->unlockSurface();
 				}
 			} else {
-				if (link->action != 16 || _activeItem != kItemKey) {
+				if (link->action != kActionRattle || _activeItem != kItemKey) {
 					if (link->param1 == 109) {
 						queueSFX(kCharacterCath, 26, 0);
 					} else {
diff --git a/engines/lastexpress/game/navigation.cpp b/engines/lastexpress/game/navigation.cpp
index 7ee4ef5ab11..cb7ef3c4ce1 100644
--- a/engines/lastexpress/game/navigation.cpp
+++ b/engines/lastexpress/game/navigation.cpp
@@ -546,7 +546,7 @@ void LogicManager::nodeStepMouse(Event *event) {
 								flag = false;
 							}
 
-							if (!_engine->isDemo() && actionLink.action == 43 &&
+							if (!_engine->isDemo() && actionLink.action == kActionSwitchChapter &&
 								actionLink.param1 == _globals[kGlobalChapter] &&
 								(event->flags & kMouseFlagRightButton) != 0) {
 								doF4();
diff --git a/engines/lastexpress/sound/sound.cpp b/engines/lastexpress/sound/sound.cpp
index aa3f6a9b71d..372164c0e38 100644
--- a/engines/lastexpress/sound/sound.cpp
+++ b/engines/lastexpress/sound/sound.cpp
@@ -267,7 +267,7 @@ void SoundManager::ambientAI(int id) {
 
 					if (_engine->getLogicManager()->inComp(kCharacterCath, getCharacter(kCharacterCath).characterPosition.car, positions[pos])) {
 						numLoops[0] = 1;
-						soundId = _engine->getLogicManager()->_doors[objNum].status == kObjectLocation2 ? 6 : 1;
+						soundId = _engine->getLogicManager()->_doors[objNum].status == 2 ? 6 : 1;
 					}
 
 					objNum++;