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

[sluicebox]

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:
b68f068b5a ICB: Declare Fatal_error NORETURN
c6c89be3f8 AGI: Fix Cmd_RunOpcode output


Commit: b68f068b5a02506634711197ddc64e9e96e27412
    https://github.com/scummvm/scummvm/commit/b68f068b5a02506634711197ddc64e9e96e27412
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-12-26T12:01:12-08:00

Commit Message:
ICB: Declare Fatal_error NORETURN

Changed paths:
    engines/icb/debug_pc.h


diff --git a/engines/icb/debug_pc.h b/engines/icb/debug_pc.h
index b3237f0649c..cfe9e14d8a9 100644
--- a/engines/icb/debug_pc.h
+++ b/engines/icb/debug_pc.h
@@ -33,7 +33,7 @@ namespace ICB {
 
 extern bool8 zdebug;
 
-void Fatal_error(const char *format, ...);
+void NORETURN_PRE Fatal_error(const char *format, ...) NORETURN_POST;
 void Message_box(const char *text, ...);
 void ExitWithReport(char *format, ...);
 void Zdebug(const char *, ...);


Commit: c6c89be3f8efad93ac1d8aac52364ee3b31861ab
    https://github.com/scummvm/scummvm/commit/c6c89be3f8efad93ac1d8aac52364ee3b31861ab
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-12-26T12:01:13-08:00

Commit Message:
AGI: Fix Cmd_RunOpcode output

Changed paths:
    engines/agi/console.cpp


diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp
index ec244dd2719..cdbbd0fd50e 100644
--- a/engines/agi/console.cpp
+++ b/engines/agi/console.cpp
@@ -113,7 +113,7 @@ bool Console::Cmd_RunOpcode(int argc, const char **argv) {
 			p[3] = argv[5] ? (char)strtoul(argv[5], nullptr, 0) : 0;
 			p[4] = argv[6] ? (char)strtoul(argv[6], nullptr, 0) : 0;
 
-			debugC(5, kDebugLevelMain, "Opcode: %s %s %s %s", opCodes[i].name, argv[1], argv[2], argv[3]);
+			debugC(5, kDebugLevelMain, "Opcode: %s %d %d %d %d %d", opCodes[i].name, p[0], p[1], p[2], p[3], p[4]);
 
 			_vm->executeAgiCommand(i, p);