[Scummvm-git-logs] scummvm master -> 3062148f6e23824af5aad2402a55402bb2d46128

Strangerke noreply at scummvm.org
Tue Feb 18 21:38:50 UTC 2025


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

Summary:
2511e2b77f M4: Burger: Fix CID 1532904
3062148f6e M4: Fix CID 1564795


Commit: 2511e2b77f24ce65fbceecade40a8d6f31294f26
    https://github.com/scummvm/scummvm/commit/2511e2b77f24ce65fbceecade40a8d6f31294f26
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-18T22:38:35+01:00

Commit Message:
M4: Burger: Fix CID 1532904

Changed paths:
    engines/m4/burger/rooms/section5/section5_room.h


diff --git a/engines/m4/burger/rooms/section5/section5_room.h b/engines/m4/burger/rooms/section5/section5_room.h
index 32c90ae30d6..f8168f7af1f 100644
--- a/engines/m4/burger/rooms/section5/section5_room.h
+++ b/engines/m4/burger/rooms/section5/section5_room.h
@@ -42,6 +42,7 @@ protected:
 
 public:
 	Section5Room() : Rooms::Room() {
+		_borkHotspot.clear();
 	}
 	~Section5Room() override {}
 


Commit: 3062148f6e23824af5aad2402a55402bb2d46128
    https://github.com/scummvm/scummvm/commit/3062148f6e23824af5aad2402a55402bb2d46128
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-18T22:38:35+01:00

Commit Message:
M4: Fix CID 1564795

Changed paths:
    engines/m4/dbg/dbg_wscript.cpp


diff --git a/engines/m4/dbg/dbg_wscript.cpp b/engines/m4/dbg/dbg_wscript.cpp
index 1932de3103f..268119c9089 100644
--- a/engines/m4/dbg/dbg_wscript.cpp
+++ b/engines/m4/dbg/dbg_wscript.cpp
@@ -206,6 +206,8 @@ void dbg_AddOpcodeToMachineInstr(int instruction) {
 			Common::strcat_s(g_instructionText, PCODE_OPCODES[instruction]);
 		} else if (instruction >= 64)
 			Common::strcat_s(g_instructionText, COND_OPCODES[instruction - 64]);
+		else if (instruction >= 16 || instruction < 0)
+			warning("dbg_AddOpcodeToMachineInstr - Unexpected value for instruction: %d", instruction);
 		else
 			Common::strcat_s(g_instructionText, IMM_OPCODES[instruction]);
 		Common::strcat_s(g_instructionText, " ");




More information about the Scummvm-git-logs mailing list