[Scummvm-git-logs] scummvm master -> 2aec06d35713befcf19a890b5b75d2e8da183931

AndywinXp noreply at scummvm.org
Sat Jun 28 08:11:31 UTC 2025


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:
2aec06d357 LASTEXPRESS: More character logic copy-paste fixes


Commit: 2aec06d35713befcf19a890b5b75d2e8da183931
    https://github.com/scummvm/scummvm/commit/2aec06d35713befcf19a890b5b75d2e8da183931
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-28T10:11:27+02:00

Commit Message:
LASTEXPRESS: More character logic copy-paste fixes

Changed paths:
    engines/lastexpress/characters/ivo.cpp
    engines/lastexpress/characters/police.cpp


diff --git a/engines/lastexpress/characters/ivo.cpp b/engines/lastexpress/characters/ivo.cpp
index 7aa23c6bdcd..9bf7a23232e 100644
--- a/engines/lastexpress/characters/ivo.cpp
+++ b/engines/lastexpress/characters/ivo.cpp
@@ -81,11 +81,11 @@ void LogicManager::HAND_Ivo_DebugWalks(HAND_PARAMS) {
 
 		break;
 	case 12:
-		break;
 		getCharacter(kCharacterIvo).characterPosition.position = 0;
 		getCharacter(kCharacterIvo).characterPosition.location = 0;
 		getCharacter(kCharacterIvo).characterPosition.car = kCarGreenSleeping;
 		getCharacterCurrentParams(kCharacterIvo)[0] = 10000;
+		break;
 	default:
 		break;
 	}
diff --git a/engines/lastexpress/characters/police.cpp b/engines/lastexpress/characters/police.cpp
index 49841405658..2012afb3f13 100644
--- a/engines/lastexpress/characters/police.cpp
+++ b/engines/lastexpress/characters/police.cpp
@@ -283,6 +283,8 @@ void LogicManager::HAND_Police_DoWait(HAND_PARAMS) {
 			break;
 		}
 
+		// fall through
+	case 17:
 		if (!getCharacterParams(kCharacterPolice, 8)[0] && whoOnScreen(kCharacterPolice)) {
 			playDialog(0, "MUS007", -1, 0);
 			getCharacterParams(kCharacterPolice, 8)[0] = 1;
@@ -293,8 +295,6 @@ void LogicManager::HAND_Police_DoWait(HAND_PARAMS) {
 			PoliceCall(&LogicManager::CONS_Police_SaveGame, 2, kEventGendarmesArrestation, 0, 0);
 		}
 
-		break;
-	case 17:
 		break;
 	case 18:
 		if (getCharacter(kCharacterPolice).callbacks[getCharacter(kCharacterPolice).currentCall + 8] == 1) {




More information about the Scummvm-git-logs mailing list