[Scummvm-git-logs] scummvm master -> 37614e194e66599e8c1ad77b306d35862e4c754f
mgerhardy
noreply at scummvm.org
Mon Jan 1 17:55:00 UTC 2024
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:
37614e194e TWINE: extended error message
Commit: 37614e194e66599e8c1ad77b306d35862e4c754f
https://github.com/scummvm/scummvm/commit/37614e194e66599e8c1ad77b306d35862e4c754f
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2024-01-01T18:54:40+01:00
Commit Message:
TWINE: extended error message
Changed paths:
engines/twine/script/script_life.cpp
engines/twine/script/script_move.cpp
diff --git a/engines/twine/script/script_life.cpp b/engines/twine/script/script_life.cpp
index 2e79d6fa839..16fd7a932f6 100644
--- a/engines/twine/script/script_life.cpp
+++ b/engines/twine/script/script_life.cpp
@@ -2079,7 +2079,7 @@ void ScriptLife::doLife(int32 actorIdx) {
debugC(3, kDebugLevels::kDebugScripts, "LIFE::EXEC(%s, %i)", _functionMap[scriptOpcode].name, actorIdx);
end = _functionMap[scriptOpcode].function(_engine, ctx);
} else {
- error("Actor %d with wrong offset/opcode - Offset: %d/%d (opcode: %i)", actorIdx, (int)ctx.stream.pos() - 1, (int)ctx.stream.size(), scriptOpcode);
+ error("Actor %d with wrong offset/opcode in life script - Offset: %d/%d (opcode: %i)", actorIdx, (int)ctx.stream.pos() - 1, (int)ctx.stream.size(), scriptOpcode);
}
if (end < 0) {
diff --git a/engines/twine/script/script_move.cpp b/engines/twine/script/script_move.cpp
index b4a612466d0..7ba1db9f3b8 100644
--- a/engines/twine/script/script_move.cpp
+++ b/engines/twine/script/script_move.cpp
@@ -648,7 +648,7 @@ void ScriptMove::doTrack(int32 actorIdx) {
debugC(3, kDebugLevels::kDebugScripts, "MOVE::EXEC(%s, %i)", _functionMap[scriptOpcode].name, actorIdx);
end = _functionMap[scriptOpcode].function(_engine, ctx);
} else {
- error("Actor %d with wrong offset/opcode - Offset: %d/%d (opcode: %u)", actorIdx, (int)ctx.stream.pos() - 1, (int)ctx.stream.size(), scriptOpcode);
+ error("Actor %d with wrong offset/opcode in move script - Offset: %d/%d (opcode: %u)", actorIdx, (int)ctx.stream.pos() - 1, (int)ctx.stream.size(), scriptOpcode);
}
if (end < 0) {
More information about the Scummvm-git-logs
mailing list