[Scummvm-git-logs] scummvm master -> 0df0a87819503ace937417a4ee389563fbd5c5fd

[bluegr]

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

Summary:
0df0a87819 STARTREK: Clip chapter 2 (Tug) mission score to acceptable values


Commit: 0df0a87819503ace937417a4ee389563fbd5c5fd
    https://github.com/scummvm/scummvm/commit/0df0a87819503ace937417a4ee389563fbd5c5fd
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-01-25T00:42:32+02:00

Commit Message:
STARTREK: Clip chapter 2 (Tug) mission score to acceptable values

Changed paths:
    engines/startrek/rooms/tug0.cpp
    engines/startrek/rooms/tug3.cpp


diff --git a/engines/startrek/rooms/tug0.cpp b/engines/startrek/rooms/tug0.cpp
index 6b9be975007..ef2d61d3710 100644
--- a/engines/startrek/rooms/tug0.cpp
+++ b/engines/startrek/rooms/tug0.cpp
@@ -509,8 +509,8 @@ void Room::tug0BombExploded() {
 
 	_awayMission->tug.field2d = 1;
 	_awayMission->disableInput = true;
-	if (_awayMission->tug.missionScore < 0)
-		_awayMission->tug.missionScore = 0;
+	// FIXME: Why do we need to clip the mission score? It shouldn't have gone above 32
+	_awayMission->tug.missionScore = CLIP<int16>(_awayMission->tug.missionScore, 0, 32);
 	endMission(_awayMission->tug.missionScore, _awayMission->tug.field2b, _awayMission->tug.field2d);
 }
 
diff --git a/engines/startrek/rooms/tug3.cpp b/engines/startrek/rooms/tug3.cpp
index 9b6aa2275f5..51c8f3218d3 100644
--- a/engines/startrek/rooms/tug3.cpp
+++ b/engines/startrek/rooms/tug3.cpp
@@ -494,8 +494,8 @@ void Room::tug3UseCommunicator() {
 			playMidiMusicTracks(MIDITRACK_NONE);
 
 			_awayMission->disableInput = true;
-			if (_awayMission->tug.missionScore < 0)
-				_awayMission->tug.missionScore = 0;
+			// FIXME: Why do we need to clip the mission score? It shouldn't have gone above 32
+			_awayMission->tug.missionScore = CLIP<int16>(_awayMission->tug.missionScore, 0, 32);
 			endMission(_awayMission->tug.missionScore, _awayMission->tug.field2b, _awayMission->tug.field2d);
 		}
 	}
@@ -586,8 +586,8 @@ void Room::tug3SecurityTeamBeamedIn() {
 
 	playMidiMusicTracks(MIDITRACK_NONE);
 	_awayMission->disableInput = true;
-	if (_awayMission->tug.missionScore < 0)
-		_awayMission->tug.missionScore = 0;
+	// FIXME: Why do we need to clip the mission score? It shouldn't have gone above 32
+	_awayMission->tug.missionScore = CLIP<int16>(_awayMission->tug.missionScore, 0, 32);
 	endMission(_awayMission->tug.missionScore, _awayMission->tug.field2b, _awayMission->tug.field2d);
 }