[Scummvm-git-logs] scummvm master -> 8c2eacac2ea1c0775ffcc765ec3772640498f543
Strangerke
noreply at scummvm.org
Mon Feb 9 13:16:10 UTC 2026
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:
8c2eacac2e M4: cleanup types in m4_types, remove parameters from ws_error that aren't being used as error.m4 doesn't exist
Commit: 8c2eacac2ea1c0775ffcc765ec3772640498f543
https://github.com/scummvm/scummvm/commit/8c2eacac2ea1c0775ffcc765ec3772640498f543
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-09T14:15:49+01:00
Commit Message:
M4: cleanup types in m4_types, remove parameters from ws_error that aren't being used as error.m4 doesn't exist
Changed paths:
engines/m4/adv_r/adv_rails.cpp
engines/m4/core/cstring.cpp
engines/m4/core/errors.cpp
engines/m4/core/errors.h
engines/m4/dbg/dbg_wscript.cpp
engines/m4/dbg/dbg_wscript.h
engines/m4/graphics/gr_font.cpp
engines/m4/graphics/krn_pal.cpp
engines/m4/m4_types.h
engines/m4/wscript/ws_cruncher.cpp
engines/m4/wscript/ws_hal.cpp
engines/m4/wscript/ws_hal.h
engines/m4/wscript/ws_machine.cpp
diff --git a/engines/m4/adv_r/adv_rails.cpp b/engines/m4/adv_r/adv_rails.cpp
index 387aaabf6e8..f8412f30149 100644
--- a/engines/m4/adv_r/adv_rails.cpp
+++ b/engines/m4/adv_r/adv_rails.cpp
@@ -583,7 +583,7 @@ int32 AddRailNode(int32 x, int32 y, Buffer *walkCodes, bool restoreEdges) {
if (i < MAXRAILNODES) {
railNode *newNode = (railNode *)mem_alloc(sizeof(railNode), "railNode");
- newNode->nodeID = (Byte)i;
+ newNode->nodeID = (byte)i;
newNode->x = (int16)x;
newNode->y = (int16)y;
_G(rails).myNodes[i] = newNode;
diff --git a/engines/m4/core/cstring.cpp b/engines/m4/core/cstring.cpp
index 40696086627..9b81f6744db 100644
--- a/engines/m4/core/cstring.cpp
+++ b/engines/m4/core/cstring.cpp
@@ -24,10 +24,6 @@
namespace M4 {
-bool cstr_isdigit(char c) {
- return (c >= '0' && c <= '9');
-}
-
int32 cstrlen(const char *s) {
if (!s)
return 0;
diff --git a/engines/m4/core/errors.cpp b/engines/m4/core/errors.cpp
index 974e68d8910..1fae0c23391 100644
--- a/engines/m4/core/errors.cpp
+++ b/engines/m4/core/errors.cpp
@@ -25,16 +25,12 @@
namespace M4 {
-inline static bool quadchar_equals_string(uint32 code, const Common::String &str) {
- return READ_BE_UINT32(str.c_str()) == code;
-}
-
void error_show(const char *filename, uint32 line, const char *fmt, ...) {
assert(fmt);
va_list va;
va_start(va, fmt);
- const Common::String msg = Common::String::vformat(fmt, va);
+ Common::String msg = Common::String::vformat(fmt, va);
va_end(va);
error("%s", msg.c_str());
@@ -44,31 +40,4 @@ void error_show(const char *filename, uint32 line) {
error_show(filename, line, "No extra description");
}
-void error_look_up(quadchar errorCode, char *result_string) {
- Common::File f;
- *result_string = '\0';
-
- if (!f.open(ERROR_FILE))
- return;
-
- Common::String buffer;
-
- while (!f.eos()) {
- buffer = f.readString();
- const char *mark = buffer.c_str() + 1;
-
- if (quadchar_equals_string(errorCode, buffer) || quadchar_equals_string(errorCode, mark)) {
- const char *src = (const char *)buffer.c_str() + 5;
- int16 count = 0;
-
- do {
- *result_string++ = *src;
- ++count;
- } while (*src++ && (count < MAX_STRING_LEN));
-
- break;
- }
- }
-}
-
} // namespace M4
diff --git a/engines/m4/core/errors.h b/engines/m4/core/errors.h
index ff624b19076..bb8d2701c52 100644
--- a/engines/m4/core/errors.h
+++ b/engines/m4/core/errors.h
@@ -23,16 +23,13 @@
#define M4_CORE_ERRORS_H
#include "common/scummsys.h"
-#include "m4/m4_types.h"
namespace M4 {
#define FL __FILE__,__LINE__
-#define ERROR_FILE "error.m4"
void NORETURN_PRE error_show(const char *filename, uint32 line, const char *fmt, ...) NORETURN_POST;
void NORETURN_PRE error_show(const char *filename, uint32 line) NORETURN_POST;
-void error_look_up(quadchar errorCode, char *result_string);
} // namespace M4
diff --git a/engines/m4/dbg/dbg_wscript.cpp b/engines/m4/dbg/dbg_wscript.cpp
index 268119c9089..21b8ad4d0db 100644
--- a/engines/m4/dbg/dbg_wscript.cpp
+++ b/engines/m4/dbg/dbg_wscript.cpp
@@ -250,34 +250,4 @@ void dbg_EndCurrMachInstr() {
debugC(1, kDebugScripts, "%s", g_instructionText);
}
-void dbg_SetCurrSequInstr(Anim8 *myAnim8, int32 compareCCR) {
- // No implementation
-}
-
-
-void dbg_ws_update() {
- // No implementation
-}
-
-void dbg_LaunchSequence(Anim8 *myAnim8) {
- // No implementation
-}
-
-void dbg_DebugWSMach(machine *m, bool debug) {
- // No implementation
-}
-
-void dbg_DebugNextCycle() {
- // No implementation
-}
-
-void dbg_RemoveWSMach(machine *m) {
- // No implementation
-}
-
-void dbg_WSError(Common::WriteStream *logFile, machine *m, int32 errorType,
- const char *errDesc, const char *errMsg, int32 pcOffset) {
- // No implementation
-}
-
} // namespace M4
diff --git a/engines/m4/dbg/dbg_wscript.h b/engines/m4/dbg/dbg_wscript.h
index cde792be1c8..6b749d09d64 100644
--- a/engines/m4/dbg/dbg_wscript.h
+++ b/engines/m4/dbg/dbg_wscript.h
@@ -24,7 +24,6 @@
#include "common/stream.h"
#include "m4/m4_types.h"
-#include "m4/dbg/dbg_defs.h"
#include "m4/graphics/gr_font.h"
#include "m4/wscript/ws_machine.h"
@@ -39,15 +38,6 @@ extern void dbg_AddParamToCurrMachInstr(const char *param);
extern void dbg_AddGlobalParamToCurrMachInstr(int num, const char *prefix = nullptr);
extern void dbg_AddRegParamToCurrMachInstr(int num, const char *prefix = nullptr);
-extern void dbg_ws_update();
-
-extern void dbg_LaunchSequence(Anim8 *myAnim8);
-extern void dbg_DebugWSMach(machine *m, bool debug);
-extern void dbg_DebugNextCycle();
-extern void dbg_RemoveWSMach(machine *m);
-extern void dbg_SetCurrSequInstr(Anim8 *myAnim8, int32 compareCCR);
-extern void dbg_WSError(Common::WriteStream *logFile, machine *m, int32 errorType, const char *errDesc, const char *errMsg, int32 pcOffset);
-
} // namespace M4
#endif
diff --git a/engines/m4/graphics/gr_font.cpp b/engines/m4/graphics/gr_font.cpp
index 2e05d028b08..945667a5324 100644
--- a/engines/m4/graphics/gr_font.cpp
+++ b/engines/m4/graphics/gr_font.cpp
@@ -290,8 +290,8 @@ int32 gr_font_write(Buffer *target, char *out_string, int32 x, int32 y, int32 w,
byte *prev_target_ptr = target_ptr;
int32 cursX = x;
- Byte *widthArray = _G(font)->width;
- Byte *fontPixData = _G(font)->pixData;
+ byte *widthArray = _G(font)->width;
+ byte *fontPixData = _G(font)->pixData;
short *offsetArray = _G(font)->offset;
while (*out_string) {
@@ -305,7 +305,7 @@ int32 gr_font_write(Buffer *target, char *out_string, int32 x, int32 y, int32 w,
return cursX;
const int32 offset = offsetArray[c];
- Byte *charData = &fontPixData[offset];
+ byte *charData = &fontPixData[offset];
const int32 bytesInChar = (_G(font)->width[c] >> 2) + 1; // bytesPer[wdth]; // 2 bits per pixel
if (skipTop)
@@ -313,7 +313,7 @@ int32 gr_font_write(Buffer *target, char *out_string, int32 x, int32 y, int32 w,
for (int32 i = 0; i < height; i++) {
for (int32 j = 0; j < bytesInChar; j++) {
- const Byte workByte = *charData++;
+ const byte workByte = *charData++;
if (workByte & 0xc0)
*target_ptr = font_colors[(workByte & 0xc0) >> 6];
target_ptr++;
diff --git a/engines/m4/graphics/krn_pal.cpp b/engines/m4/graphics/krn_pal.cpp
index 5f0599c6b0b..630dd7f3789 100644
--- a/engines/m4/graphics/krn_pal.cpp
+++ b/engines/m4/graphics/krn_pal.cpp
@@ -64,17 +64,17 @@ static void grey_fade(RGB8 *pal, int32 to_from_flag, int32 from, int32 to, int32
for (int i = 1; i < steps; i++) {
for (int j = from; j <= to; j++) {
if (to_from_flag == TO_GREY) { // fade to grey from full color
- working[j].r = (Byte)((int)pal[j].r + ((((int)_GP(fadeToMe)[j].r - (int)pal[j].r) * i) / steps));
- working[j].g = (Byte)((int)pal[j].g + ((((int)_GP(fadeToMe)[j].g - (int)pal[j].g) * i) / steps));
- working[j].b = (Byte)((int)pal[j].b + ((((int)_GP(fadeToMe)[j].b - (int)pal[j].b) * i) / steps));
+ working[j].r = (byte)((int)pal[j].r + ((((int)_GP(fadeToMe)[j].r - (int)pal[j].r) * i) / steps));
+ working[j].g = (byte)((int)pal[j].g + ((((int)_GP(fadeToMe)[j].g - (int)pal[j].g) * i) / steps));
+ working[j].b = (byte)((int)pal[j].b + ((((int)_GP(fadeToMe)[j].b - (int)pal[j].b) * i) / steps));
} else if (to_from_flag == TO_COLOR) { // fade from grey to full color
- working[j].r = (Byte)((int)_GP(fadeToMe)[j].r + ((((int)pal[j].r - (int)_GP(fadeToMe)[j].r) * i) / steps));
- working[j].g = (Byte)((int)_GP(fadeToMe)[j].g + ((((int)pal[j].g - (int)_GP(fadeToMe)[j].g) * i) / steps));
- working[j].b = (Byte)((int)_GP(fadeToMe)[j].b + ((((int)pal[j].b - (int)_GP(fadeToMe)[j].b) * i) / steps));
+ working[j].r = (byte)((int)_GP(fadeToMe)[j].r + ((((int)pal[j].r - (int)_GP(fadeToMe)[j].r) * i) / steps));
+ working[j].g = (byte)((int)_GP(fadeToMe)[j].g + ((((int)pal[j].g - (int)_GP(fadeToMe)[j].g) * i) / steps));
+ working[j].b = (byte)((int)_GP(fadeToMe)[j].b + ((((int)pal[j].b - (int)_GP(fadeToMe)[j].b) * i) / steps));
} else { //fade from grey to black
- working[j].r = (Byte)((int)_GP(fadeToMe)[j].r - ((((int)_GP(fadeToMe)[j].r) * i) / steps));
- working[j].g = (Byte)((int)_GP(fadeToMe)[j].g - ((((int)_GP(fadeToMe)[j].g) * i) / steps));
- working[j].b = (Byte)((int)_GP(fadeToMe)[j].b - ((((int)_GP(fadeToMe)[j].b) * i) / steps));
+ working[j].r = (byte)((int)_GP(fadeToMe)[j].r - ((((int)_GP(fadeToMe)[j].r) * i) / steps));
+ working[j].g = (byte)((int)_GP(fadeToMe)[j].g - ((((int)_GP(fadeToMe)[j].g) * i) / steps));
+ working[j].b = (byte)((int)_GP(fadeToMe)[j].b - ((((int)_GP(fadeToMe)[j].b) * i) / steps));
}
}
@@ -107,7 +107,7 @@ static void grey_fade(RGB8 *pal, int32 to_from_flag, int32 from, int32 to, int32
static void create_luminance_map(RGB8 *pal) {
for (int i = GREY_START; i <= FREE_END; i++) {
- const Byte luminance = (Byte)((pal[i].r + pal[i].g + pal[i].b) / 3);
+ const byte luminance = (byte)((pal[i].r + pal[i].g + pal[i].b) / 3);
_GP(fadeToMe)[i].g = luminance;
// Orion Burger uses green shading, Riddle uses grey shading
_GP(fadeToMe)[i].r = _GP(fadeToMe)[i].b = IS_RIDDLE ? luminance : 0;
@@ -582,9 +582,9 @@ static void pal_fade_update(RGB8 *origPalette) {
_GP(myFadeCurrPercentFrac) = tempFrac2;
for (int32 i = _GP(myFadeStartIndex); i <= _GP(myFadeEndIndex); i++) {
- _GP(myFXPalette)[i].r = (Byte)(MulSF16(origPalette[i].r << 16, tempFrac2) >> 16);
- _GP(myFXPalette)[i].g = (Byte)(MulSF16(origPalette[i].g << 16, tempFrac2) >> 16);
- _GP(myFXPalette)[i].b = (Byte)(MulSF16(origPalette[i].b << 16, tempFrac2) >> 16);
+ _GP(myFXPalette)[i].r = (byte)(MulSF16(origPalette[i].r << 16, tempFrac2) >> 16);
+ _GP(myFXPalette)[i].g = (byte)(MulSF16(origPalette[i].g << 16, tempFrac2) >> 16);
+ _GP(myFXPalette)[i].b = (byte)(MulSF16(origPalette[i].b << 16, tempFrac2) >> 16);
}
// Recalculate the end delay time again
diff --git a/engines/m4/m4_types.h b/engines/m4/m4_types.h
index c8bbda3bf7f..0a2fc5d38dd 100644
--- a/engines/m4/m4_types.h
+++ b/engines/m4/m4_types.h
@@ -46,18 +46,6 @@ typedef void *Handle;
typedef intptr frac16;
typedef uint32 ulong;
-typedef uint32 quadchar;
-typedef uint32 trigraph;
-
-typedef byte Bit;
-typedef byte Bool;
-typedef byte boolean;
-typedef byte Boolean;
-typedef byte byte;
-typedef byte Byte;
-typedef uint16 word;
-typedef uint16 Word;
-typedef uint32 DWord;
enum {
TRIG_INV_CLICK = 32000,
diff --git a/engines/m4/wscript/ws_cruncher.cpp b/engines/m4/wscript/ws_cruncher.cpp
index 416d0e409af..e3389fb442a 100644
--- a/engines/m4/wscript/ws_cruncher.cpp
+++ b/engines/m4/wscript/ws_cruncher.cpp
@@ -566,7 +566,7 @@ static void op_CLEAR(Anim8 *myAnim8) {
static void op_SET(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = arg2 or arg1 = rand(arg2, arg3)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = arg2 or arg1 = rand(arg2, arg3)");
}
if (_GWS(myArg3)) {
*_GWS(myArg1) = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -578,7 +578,7 @@ static void op_SET(Anim8 *myAnim8) {
static void op_COMPARE(Anim8 *myAnim8) {
frac16 myArg;
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: cmp arg1, arg2 or cmp arg1, rand(arg2, arg3) **sets CCR");
+ ws_Error(myAnim8->myMachine, "functionality: cmp arg1, arg2 or cmp arg1, rand(arg2, arg3) **sets CCR");
}
if (_GWS(myArg3)) {
myArg = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -596,7 +596,7 @@ static void op_COMPARE(Anim8 *myAnim8) {
static void op_ADD(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 += arg2 or arg1 += rand(arg2, arg3)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 += arg2 or arg1 += rand(arg2, arg3)");
}
if (_GWS(myArg3)) {
*_GWS(myArg1) += imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -607,7 +607,7 @@ static void op_ADD(Anim8 *myAnim8) {
static void op_SUB(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 -= arg2 or arg1 -= rand(arg2, arg3)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 -= arg2 or arg1 -= rand(arg2, arg3)");
}
if (_GWS(myArg3)) {
*_GWS(myArg1) -= imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -618,7 +618,7 @@ static void op_SUB(Anim8 *myAnim8) {
static void op_MULT(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 *= arg2 or arg1 *= rand(arg2, arg3)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 *= arg2 or arg1 *= rand(arg2, arg3)");
}
if (_GWS(myArg3)) {
*_GWS(myArg1) = MulSF16(*_GWS(myArg1), imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3)));
@@ -630,7 +630,7 @@ static void op_MULT(Anim8 *myAnim8) {
static void op_DIV(Anim8 *myAnim8) {
frac16 divisor;
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 /= arg2 or arg1 /= rand(arg2, arg3)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 /= arg2 or arg1 /= rand(arg2, arg3)");
}
if (_GWS(myArg3)) {
divisor = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -638,7 +638,7 @@ static void op_DIV(Anim8 *myAnim8) {
divisor = *_GWS(myArg2);
}
if (divisor == 0) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0253, nullptr);
+ ws_Error(myAnim8->myMachine, nullptr);
} else {
*_GWS(myArg1) = DivSF16(*_GWS(myArg1), divisor);
}
@@ -648,7 +648,7 @@ static void op_SIN(Anim8 *myAnim8) {
int32 tempAngle;
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = sin(arg2) or arg1 = sin(rand(arg2, arg3))");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = sin(arg2) or arg1 = sin(rand(arg2, arg3))");
}
if (_GWS(myArg3)) {
tempAngle = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3)) >> 16;
@@ -668,7 +668,7 @@ static void op_COS(Anim8 *myAnim8) {
int32 tempAngle;
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = cos(arg2) or arg1 = cos(rand(arg2, arg3))");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = cos(arg2) or arg1 = cos(rand(arg2, arg3))");
}
if (_GWS(myArg3)) {
tempAngle = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3)) >> 16;
@@ -688,7 +688,7 @@ static void op_AND(Anim8 *myAnim8) {
frac16 myArg;
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 &= arg2 or arg1 &= rand(arg2, arg3) **also sets CCR");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 &= arg2 or arg1 &= rand(arg2, arg3) **also sets CCR");
}
if (_GWS(myArg3)) {
myArg = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -708,7 +708,7 @@ static void op_OR(Anim8 *myAnim8) {
frac16 myArg;
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 |= arg2 or arg1 |= rand(arg2, arg3) **also sets CCR");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 |= arg2 or arg1 |= rand(arg2, arg3) **also sets CCR");
}
if (_GWS(myArg3)) {
myArg = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -726,7 +726,7 @@ static void op_OR(Anim8 *myAnim8) {
static void op_NOT(Anim8 *myAnim8) {
if (!_GWS(myArg1)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0250, "functionality: arg1 = (arg1 ? 0 : 1) **also sets CCR");
+ ws_Error(myAnim8->myMachine,"functionality: arg1 = (arg1 ? 0 : 1) **also sets CCR");
}
if (*_GWS(myArg1) == 0) {
*_GWS(myArg1) = 0x10000;
@@ -739,7 +739,7 @@ static void op_NOT(Anim8 *myAnim8) {
static void op_ABS(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = abs(arg2)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = abs(arg2)");
}
if (*_GWS(myArg2) < 0) {
*_GWS(myArg1) = -(int)(*_GWS(myArg2));
@@ -750,7 +750,7 @@ static void op_ABS(Anim8 *myAnim8) {
static void op_MIN(Anim8 *myAnim8) {
if (!_GWS(myArg3)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0252, "functionality: arg1 = min(arg2, arg3)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = min(arg2, arg3)");
}
if (*_GWS(myArg2) < *_GWS(myArg3)) {
*_GWS(myArg1) = *_GWS(myArg2);
@@ -761,7 +761,7 @@ static void op_MIN(Anim8 *myAnim8) {
static void op_MAX(Anim8 *myAnim8) {
if (!_GWS(myArg3)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0252, "functionality: arg1 = max(arg2, arg3)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = max(arg2, arg3)");
}
if (*_GWS(myArg2) < *_GWS(myArg3)) {
*_GWS(myArg1) = *_GWS(myArg3);
@@ -772,7 +772,7 @@ static void op_MAX(Anim8 *myAnim8) {
static void op_MOD(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 %= arg2 or arg1 = arg2%arg3");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 %= arg2 or arg1 = arg2%arg3");
}
if (_GWS(myArg3)) {
*_GWS(myArg1) = (*_GWS(myArg1)) % (imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3)));
@@ -783,7 +783,7 @@ static void op_MOD(Anim8 *myAnim8) {
static void op_FLOOR(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = floor(arg2) or arg1 = floor(rand(arg2,arg3))");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = floor(arg2) or arg1 = floor(rand(arg2,arg3))");
}
if (_GWS(myArg3)) {
*_GWS(myArg1) = (imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3)) >> 16) << 16;
@@ -795,7 +795,7 @@ static void op_FLOOR(Anim8 *myAnim8) {
static void op_ROUND(Anim8 *myAnim8) {
frac16 myArg;
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = round(arg2) or arg1 = round(rand(arg2,arg3))");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = round(arg2) or arg1 = round(rand(arg2,arg3))");
}
if (_GWS(myArg3)) {
myArg = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -812,7 +812,7 @@ static void op_ROUND(Anim8 *myAnim8) {
static void op_CEIL(Anim8 *myAnim8) {
frac16 myArg;
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = ceil(arg2) or arg1 = ceil(rand(arg2,arg3))");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = ceil(arg2) or arg1 = ceil(rand(arg2,arg3))");
}
if (_GWS(myArg3)) {
myArg = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -828,14 +828,14 @@ static void op_CEIL(Anim8 *myAnim8) {
static void op_POINT(Anim8 *myAnim8) {
if (!_GWS(myArg3)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0252, "functionality: arg1 = angle of line segment (x, y) , (arg2, arg3)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = angle of line segment (x, y) , (arg2, arg3)");
}
*_GWS(myArg1) = Atan2F16(-(int)(*_GWS(myArg3)) + myAnim8->myRegs[IDX_Y], *_GWS(myArg2) - myAnim8->myRegs[IDX_X]);
}
static void op_DIST2D(Anim8 *myAnim8) {
if (!_GWS(myArg3)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0252, "functionality: arg1 = distance from (x, y) to (arg2, arg3)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = distance from (x, y) to (arg2, arg3)");
}
int32 temp1 = (int32)(imath_abs(*_GWS(myArg2) - myAnim8->myRegs[IDX_X]));
int32 temp2 = (int32)(imath_abs(*_GWS(myArg3) - myAnim8->myRegs[IDX_Y]));
@@ -871,7 +871,7 @@ static void op_CRUNCH(Anim8 *myAnim8) {
static void op_BRANCH(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "check the CCR, arg1 is the branch type, arg2 is the PC offset");
+ ws_Error(myAnim8->myMachine, "check the CCR, arg1 is the branch type, arg2 is the PC offset");
}
const int32 myOffset = *_GWS(myArg2) >> 14;
switch (*_GWS(myArg1) >> 16) {
@@ -905,7 +905,7 @@ static void op_SETCEL(Anim8 *myAnim8) {
int32 myIndex;
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "setcel(arg1, arg2) or setcel(arg1, rand(arg2, arg3))");
+ ws_Error(myAnim8->myMachine, "setcel(arg1, arg2) or setcel(arg1, rand(arg2, arg3))");
}
if (_GWS(myArg3)) {
myIndex = imath_ranged_rand(*_GWS(myArg2) >> 16, *_GWS(myArg3) >> 16);
@@ -928,7 +928,7 @@ static void op_SETCEL(Anim8 *myAnim8) {
ShowCCB(myCCB);
myCCB->flags |= CCB_SKIP;
if ((myAnim8->myCCB = GetWSAssetCEL((uint32)(*_GWS(myArg1)) >> 24, (uint32)myIndex, myCCB)) == nullptr) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x025b, "setcel() failed.");
+ ws_Error(myAnim8->myMachine, "setcel() failed.");
}
frac16 *myRegs = myAnim8->myRegs;
if (myRegs[IDX_W] < 0) {
@@ -947,7 +947,7 @@ static void op_SEQ_SEND_MSG(Anim8 *myAnim8) {
//_GWS(myArg1) is the recipient machine hash, _GWS(myArg2) is the msg hash, _GWS(myArg3) (if exists) is the msg value
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: send to machine arg1, the message arg2 or the message arg2, arg3");
+ ws_Error(myAnim8->myMachine, "functionality: send to machine arg1, the message arg2 or the message arg2, arg3");
}
if (_GWS(myArg3)) {
@@ -965,7 +965,7 @@ static void op_PUSH(Anim8 *myAnim8) {
int32 numOfArgs;
if (!_GWS(myArg1)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0250, "functionality: push arg1 or start with arg1, and push a total of arg2 values");
+ ws_Error(myAnim8->myMachine, "functionality: push arg1 or start with arg1, and push a total of arg2 values");
}
int32 direction = 1;
if (_GWS(myArg2)) {
@@ -979,7 +979,7 @@ static void op_PUSH(Anim8 *myAnim8) {
}
if (((byte *)_GWS(stackLimit) - (byte *)_GWS(stackTop)) < (numOfArgs << 2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0254, "overflow during push instruction");
+ ws_Error(myAnim8->myMachine,"overflow during push instruction");
return;
}
if (_GWS(myArg2)) {
@@ -997,7 +997,7 @@ static void op_POP(Anim8 *myAnim8) {
int32 numOfArgs;
if (!_GWS(myArg1)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0250, "functionality: pop into arg1 or start with arg1, and pop a total of arg2 values");
+ ws_Error(myAnim8->myMachine, "functionality: pop into arg1 or start with arg1, and pop a total of arg2 values");
}
int32 direction = 1;
if (_GWS(myArg2)) {
@@ -1009,7 +1009,7 @@ static void op_POP(Anim8 *myAnim8) {
} else
numOfArgs = 1;
if (((byte *)_GWS(stackTop) - (byte *)_GWS(stackBase)) < (numOfArgs << 2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0255, "underflow during pop instruction");
+ ws_Error(myAnim8->myMachine, "underflow during pop instruction");
}
if (_GWS(myArg2)) {
uint32 *data = (uint32 *)_GWS(myArg1);
@@ -1025,7 +1025,7 @@ static void op_POP(Anim8 *myAnim8) {
static void op_JSR(Anim8 *myAnim8) {
if (myAnim8->returnStackIndex >= JSR_STACK_MAX) {
ws_LogErrorMsg(FL, "Max number of nested jsr instructions is: %d", JSR_STACK_MAX);
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0256, "jsr() failed");
+ ws_Error(myAnim8->myMachine, "jsr() failed");
}
myAnim8->returnHashes[myAnim8->returnStackIndex] = myAnim8->sequHash;
myAnim8->returnOffsets[myAnim8->returnStackIndex] = myAnim8->pcOffset;
@@ -1035,11 +1035,9 @@ static void op_JSR(Anim8 *myAnim8) {
int32 dummy;
myAnim8->sequHandle = ws_GetSEQU((uint32)*_GWS(myArg1) >> 16, &dummy, &myAnim8->pcOffset);
if (myAnim8->sequHandle == nullptr) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x025f, "jsr() failed");
+ ws_Error(myAnim8->myMachine, "jsr() failed");
}
myAnim8->sequHash = (uint32)*_GWS(myArg1) >> 16;
-
- dbg_LaunchSequence(myAnim8);
}
static void op_RETURN(Anim8 *myAnim8) {
@@ -1056,38 +1054,36 @@ static void op_RETURN(Anim8 *myAnim8) {
int32 dummy, dummy2;
myAnim8->sequHandle = ws_GetSEQU((uint32)returnSequHash, &dummy, &dummy2);
if (myAnim8->sequHandle == nullptr) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x025f, "return() failed");
+ ws_Error(myAnim8->myMachine, "return() failed");
}
myAnim8->sequHash = returnSequHash;
myAnim8->pcOffset = returnOffset;
-
- dbg_LaunchSequence(myAnim8);
}
static void op_GET_CELS_COUNT(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = series_count(arg2)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = series_count(arg2)");
}
*_GWS(myArg1) = GetWSAssetCELCount((uint32)(*_GWS(myArg2)) >> 24) << 16;
}
static void op_GET_CELS_FRAME_RATE(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = series_frame_rate(arg2)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = series_frame_rate(arg2)");
}
*_GWS(myArg1) = GetWSAssetCELFrameRate((uint32)(*_GWS(myArg2)) >> 24);
}
static void op_GET_CELS_PIX_SPEED(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: arg1 = series_pix_speed(arg2)");
+ ws_Error(myAnim8->myMachine, "functionality: arg1 = series_pix_speed(arg2)");
}
*_GWS(myArg1) = GetWSAssetCELPixSpeed((uint32)(*_GWS(myArg2)) >> 24);
}
static void op_SET_INDEX(Anim8 *myAnim8) {
if (!_GWS(myArg1)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0250, "functionality: index_reg = arg1");
+ ws_Error(myAnim8->myMachine, "functionality: index_reg = arg1");
}
_GWS(indexReg) = *_GWS(myArg1) >> 16;
}
@@ -1095,7 +1091,7 @@ static void op_SET_INDEX(Anim8 *myAnim8) {
static void op_SET_LAYER(Anim8 *myAnim8) {
Anim8 *tempAnim8;
if (!_GWS(myArg1)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0250, "functionality: set_layer(arg1)");
+ ws_Error(myAnim8->myMachine, "functionality: set_layer(arg1)");
}
const int32 newLayer = *_GWS(myArg1) >> 16;
@@ -1189,10 +1185,10 @@ static void op_SET_LAYER(Anim8 *myAnim8) {
static void op_SET_DEPTH(Anim8 *myAnim8) {
int32 myDepth;
if (!_GWS(myArg1)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0250, "functionality: set_depth(arg1)");
+ ws_Error(myAnim8->myMachine, "functionality: set_depth(arg1)");
}
if (!_GWS(myDepthTable)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x02ff, "op_SET_DEPTH() failed - no depth table.");
+ ws_Error(myAnim8->myMachine, "op_SET_DEPTH() failed - no depth table.");
}
for (myDepth = 0; myDepth < 15; myDepth++) {
if (_GWS(myDepthTable)[myDepth + 1] < (int)(*_GWS(myArg1) >> 16)) break;
@@ -1204,16 +1200,16 @@ static void op_SET_DEPTH(Anim8 *myAnim8) {
static void op_SET_DATA(Anim8 *myAnim8) {
if (!_GWS(myArg2)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0251, "functionality: set_data(arg1, arg2)");
+ ws_Error(myAnim8->myMachine, "functionality: set_data(arg1, arg2)");
}
if ((myAnim8->dataHandle = ws_GetDATA(*_GWS(myArg1) >> 16, *_GWS(myArg2) >> 16, &myAnim8->dataOffset)) == nullptr) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x025f, "set_data() failed.");
+ ws_Error(myAnim8->myMachine, "set_data() failed.");
}
}
static void op_OPEN_STREAM_SS(Anim8 *myAnim8) {
if (!_GWS(myArg1)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0250, "functionality: stream_series(arg1)");
+ ws_Error(myAnim8->myMachine, "functionality: stream_series(arg1)");
}
if (!myAnim8->myCCB) {
@@ -1227,7 +1223,7 @@ static void op_OPEN_STREAM_SS(Anim8 *myAnim8) {
myCCB->flags |= CCB_SKIP;
if (!ws_OpenSSstream((SysFile *)(*_GWS(myArg1)), myAnim8)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0258, "open_ss_stream() failed.");
+ ws_Error(myAnim8->myMachine, "open_ss_stream() failed.");
}
if (myAnim8->myRegs[IDX_W] < 0)
@@ -1241,12 +1237,12 @@ static void op_OPEN_STREAM_SS(Anim8 *myAnim8) {
static void op_NEXT_STREAM_SS(Anim8 *myAnim8) {
if (!myAnim8->myCCB) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0253, "next_ss_stream() failed.");
+ ws_Error(myAnim8->myMachine, "next_ss_stream() failed.");
}
CCB *myCCB = myAnim8->myCCB;
myCCB->flags |= CCB_SKIP;
if (!ws_GetNextSSstreamCel(myAnim8)) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x0259, "next_ss_stream() failed.");
+ ws_Error(myAnim8->myMachine, "next_ss_stream() failed.");
}
if (myAnim8->myRegs[IDX_W] < 0) {
myAnim8->myRegs[IDX_W] = -myCCB->source->w << 16;
@@ -1259,7 +1255,7 @@ static void op_NEXT_STREAM_SS(Anim8 *myAnim8) {
static void op_CLOSE_STREAM_SS(Anim8 *myAnim8) {
if (!myAnim8->myCCB) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x02f3, "close_ss_stream() failed.");
+ ws_Error(myAnim8->myMachine, "close_ss_stream() failed.");
}
CCB *myCCB = myAnim8->myCCB;
ws_CloseSSstream(myCCB);
@@ -1345,8 +1341,6 @@ bool CrunchAnim8(Anim8 *myAnim8) {
// Interpret pCode instructions until we hit something signalling to stop
while (_GWS(keepProcessing)) {
- dbg_SetCurrSequInstr(myAnim8, _GWS(compareCCR));
-
myPC = (uint32 *)((intptr)*(myAnim8->sequHandle) + myAnim8->pcOffset);
uint32 *oldPC = myPC;
_GWS(pcOffsetOld) = myAnim8->pcOffset;
@@ -1355,7 +1349,7 @@ bool CrunchAnim8(Anim8 *myAnim8) {
const int32 myInstruction = ws_PreProcessPcode(&myPC, myAnim8);
if (myInstruction < 0 || myInstruction > 39) {
- ws_Error(myAnim8->myMachine, ERR_SEQU, 0x025c, nullptr);
+ ws_Error(myAnim8->myMachine, nullptr);
}
dbg_EndCurrMachInstr();
diff --git a/engines/m4/wscript/ws_hal.cpp b/engines/m4/wscript/ws_hal.cpp
index 2635fdf1beb..067307d046b 100644
--- a/engines/m4/wscript/ws_hal.cpp
+++ b/engines/m4/wscript/ws_hal.cpp
@@ -96,18 +96,10 @@ void ws_DumpMachine(machine *m, Common::WriteStream *logFile) {
}
}
-void ws_Error(machine *m, int32 errorType, trigraph errorCode, const char *errMsg) {
- char description[MAX_STRING_SIZE];
-
- // Find the error description
- error_look_up(errorCode, description);
-
+void ws_Error(machine *m, const char *errMsg) {
// Open the logFile
Common::OutSaveFile *logFile = g_system->getSavefileManager()->openForSaving("ws_mach.log");
- // Give the WS debugger a chance to indicate the error to the apps programmer
- dbg_WSError(logFile, m, errorType, description, errMsg, _GWS(pcOffsetOld));
-
// Dump out the machine to the logFile
ws_DumpMachine(m, logFile);
@@ -146,7 +138,7 @@ static void drawSprite(CCB *myCCB, Anim8 *myAnim8, Buffer *halScrnBuf, Buffer *s
// Make sure the sprite is still in memory
if (!source->sourceHandle || !*(source->sourceHandle)) {
ws_LogErrorMsg(FL, "Sprite series is no longer in memory.");
- ws_Error(myAnim8->myMachine, ERR_INTERNAL, 0x02ff, "Error during ws_DoDisplay()");
+ ws_Error(myAnim8->myMachine, "Error during ws_DoDisplay()");
}
// Lock the sprite handle
@@ -387,8 +379,7 @@ void ws_hal_RefreshWoodscriptBuffer(cruncher *myCruncher, Buffer *background,
// Make sure the series is still in memory
if ((!myCCB->source->sourceHandle) || (!*(myCCB->source->sourceHandle))) {
ws_LogErrorMsg(FL, "Sprite series is no longer in memory.");
- ws_Error(myAnim8->myMachine, ERR_INTERNAL, 0x02ff,
- "Error discovered during ws_hal_RefreshWoodscriptBuffer()");
+ ws_Error(myAnim8->myMachine, "Error discovered during ws_hal_RefreshWoodscriptBuffer()");
}
// Lock the sprite handle
diff --git a/engines/m4/wscript/ws_hal.h b/engines/m4/wscript/ws_hal.h
index 57966ab14c5..9b98188159b 100644
--- a/engines/m4/wscript/ws_hal.h
+++ b/engines/m4/wscript/ws_hal.h
@@ -63,7 +63,7 @@ void Cel_msr(Anim8 *myAnim8);
void ws_OverrideCrunchTime(machine *m);
bool CheckAddr();
-void ws_Error(machine *m, int32 errorType, quadchar errorCode, const char *errMsg);
+void ws_Error(machine *m, const char *errMsg);
void ws_DumpMachine(machine *m);
void ws_LogErrorMsg(const char *sourceFile, uint32 lineNum, const char *fmt, ...);
diff --git a/engines/m4/wscript/ws_machine.cpp b/engines/m4/wscript/ws_machine.cpp
index fa3ff32394e..131193fbade 100644
--- a/engines/m4/wscript/ws_machine.cpp
+++ b/engines/m4/wscript/ws_machine.cpp
@@ -155,7 +155,7 @@ static void op_AFTER(machine *m, int32 *pcOffset) {
int32 myElapsedTime;
if (!_GWS(myArg2)) {
- ws_Error(m, ERR_MACH, 0x0261, "functionality: after arg1 {...}");
+ ws_Error(m, "functionality: after arg1 {...}");
}
if (_GWS(myArg3)) {
@@ -170,7 +170,7 @@ static void op_AFTER(machine *m, int32 *pcOffset) {
static void op_ON_END_SEQ(machine *m, int32 *pcOffset) {
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0260, "on_seq_end() failed.");
+ ws_Error(m, "on_seq_end() failed.");
}
ws_OnEndSeqRequest(m->myAnim8, *pcOffset, *_GWS(myArg1) >> 14);
*pcOffset += (int32)*_GWS(myArg1) >> 14;
@@ -185,11 +185,11 @@ static void op_ON_END_SEQ(machine *m, int32 *pcOffset) {
static void op_ON_MSG(machine *m, int32 *pcOffset) {
msgRequest *myMsg;
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0260, "on_msg() failed.");
+ ws_Error(m, "on_msg() failed.");
}
if ((myMsg = new_msgRequest()) == nullptr) {
- ws_Error(m, ERR_MACH, 0x02fe, "on_msg() failed.");
+ ws_Error(m, "on_msg() failed.");
return;
}
@@ -218,7 +218,7 @@ static void op_ON_P_MSG(machine *m, int32 *pcOffset) {
frac16 msgValue;
if (!_GWS(myArg2)) {
- ws_Error(m, ERR_MACH, 0x0261, "functionality: on_p_msg arg1 {...}");
+ ws_Error(m, "functionality: on_p_msg arg1 {...}");
}
// Get the values for msgHash and msgValue from the args...
@@ -252,7 +252,7 @@ static void op_ON_P_MSG(machine *m, int32 *pcOffset) {
} else {
// Else a new msg has to be created
if ((myMsg = new_msgRequest()) == nullptr) {
- ws_Error(m, ERR_MACH, 0x02fe, "on_p_msg() failed.");
+ ws_Error(m, "on_p_msg() failed.");
return;
}
@@ -275,7 +275,7 @@ static void op_ON_P_MSG(machine *m, int32 *pcOffset) {
static void op_SWITCH_LT(machine *m, int32 *pcOffset) {
if (!_GWS(myArg3)) {
- ws_Error(m, ERR_MACH, 0x0262, "functionality: switch (arg1 < arg2) {...}");
+ ws_Error(m, "functionality: switch (arg1 < arg2) {...}");
}
if (*_GWS(myArg2) >= *_GWS(myArg3)) {
*pcOffset += (int32)*_GWS(myArg1) >> 14;
@@ -284,7 +284,7 @@ static void op_SWITCH_LT(machine *m, int32 *pcOffset) {
static void op_SWITCH_LE(machine *m, int32 *pcOffset) {
if (!_GWS(myArg3)) {
- ws_Error(m, ERR_MACH, 0x0262, "functionality: switch (arg1 <= arg2) {...}");
+ ws_Error(m, "functionality: switch (arg1 <= arg2) {...}");
}
if (*_GWS(myArg2) > *_GWS(myArg3)) {
*pcOffset += (int32)*_GWS(myArg1) >> 14;
@@ -293,7 +293,7 @@ static void op_SWITCH_LE(machine *m, int32 *pcOffset) {
static void op_SWITCH_EQ(machine *m, int32 *pcOffset) {
if (!_GWS(myArg3)) {
- ws_Error(m, ERR_MACH, 0x0262, "functionality: switch (arg1 == arg2) {...}");
+ ws_Error(m, "functionality: switch (arg1 == arg2) {...}");
}
if (*_GWS(myArg2) != *_GWS(myArg3)) {
*pcOffset += (int32)*_GWS(myArg1) >> 14;
@@ -302,7 +302,7 @@ static void op_SWITCH_EQ(machine *m, int32 *pcOffset) {
static void op_SWITCH_NE(machine *m, int32 *pcOffset) {
if (!_GWS(myArg3)) {
- ws_Error(m, ERR_MACH, 0x0262, "functionality: switch (arg1 != arg2) {...}");
+ ws_Error(m, "functionality: switch (arg1 != arg2) {...}");
}
if (*_GWS(myArg2) == *_GWS(myArg3)) {
*pcOffset += (int32)*_GWS(myArg1) >> 14;
@@ -311,7 +311,7 @@ static void op_SWITCH_NE(machine *m, int32 *pcOffset) {
static void op_SWITCH_GE(machine *m, int32 *pcOffset) {
if (!_GWS(myArg3)) {
- ws_Error(m, ERR_MACH, 0x0262, "functionality: switch (arg1 >= arg2) {...}");
+ ws_Error(m, "functionality: switch (arg1 >= arg2) {...}");
}
if (*_GWS(myArg2) < *_GWS(myArg3)) {
*pcOffset += (int32)*_GWS(myArg1) >> 14;
@@ -320,7 +320,7 @@ static void op_SWITCH_GE(machine *m, int32 *pcOffset) {
static void op_SWITCH_GT(machine *m, int32 *pcOffset) {
if (!_GWS(myArg3)) {
- ws_Error(m, ERR_MACH, 0x0262, "functionality: switch (arg1 > arg2) {...}");
+ ws_Error(m, "functionality: switch (arg1 > arg2) {...}");
}
if (*_GWS(myArg2) <= *_GWS(myArg3)) {
*pcOffset += (int32)*_GWS(myArg1) >> 14;
@@ -336,7 +336,7 @@ static bool op_DO_NOTHING(machine *m, int32 *pcOffset) {
static bool op_GOTO(machine *m, int32 *pcOffset) {
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0263, "functionality: goto arg1");
+ ws_Error(m, "functionality: goto arg1");
}
m->curState = (*_GWS(myArg1)) >> 16;
m->recurseLevel = 0;
@@ -345,7 +345,7 @@ static bool op_GOTO(machine *m, int32 *pcOffset) {
static bool op_JUMP(machine *m, int32 *pcOffset) {
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0263, "functionality: jump arg1");
+ ws_Error(m, "functionality: jump arg1");
}
*pcOffset += (int32)*_GWS(myArg1) >> 16;
@@ -360,23 +360,20 @@ static bool op_TERMINATE(machine *m, int32 *pcOffset) {
static bool op_START_SEQ(machine *m, int32 *pcOffset) {
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0263, "functionality: start_seq arg1");
+ ws_Error(m, "functionality: start_seq arg1");
}
// Here we check whether a program was previously running
if (!m->myAnim8) {
if ((m->myAnim8 = ws_AddAnim8ToCruncher(m, *_GWS(myArg1) >> 16)) == nullptr) {
- ws_Error(m, ERR_MACH, 0x02ff, "start_seq() failed.");
+ ws_Error(m, "start_seq() failed.");
}
} else {
if (!ws_ChangeAnim8Program(m, *_GWS(myArg1) >> 16)) {
- ws_Error(m, ERR_MACH, 0x02ff, "start_seq() failed.");
+ ws_Error(m, "start_seq() failed.");
}
}
- // Inform the ws debugger of the new sequence
- dbg_LaunchSequence(m->myAnim8);
-
return true;
}
@@ -387,7 +384,7 @@ static bool op_PAUSE_SEQ(machine *m, int32 *pcOffset) {
static bool op_STORE_VAL(machine *m, int32 *pcOffset) {
if (!_GWS(myArg2)) {
- ws_Error(m, ERR_MACH, 0x0264, "functionality: arg1 = arg2 or arg1 = rand(arg2, arg3)");
+ ws_Error(m, "functionality: arg1 = arg2 or arg1 = rand(arg2, arg3)");
}
if (_GWS(myArg3)) {
*_GWS(myArg1) = imath_ranged_rand16(*_GWS(myArg2), *_GWS(myArg3));
@@ -402,7 +399,7 @@ static bool op_SEND_MSG(machine *m, int32 *pcOffset) {
frac16 msgValue;
if (!_GWS(myArg2)) {
- ws_Error(m, ERR_MACH, 0x0264, "functionality: send to machine arg1, message arg2");
+ ws_Error(m, "functionality: send to machine arg1, message arg2");
}
if (_GWS(myArg3)) {
msgValue = *_GWS(myArg3);
@@ -417,7 +414,7 @@ static bool op_SEND_GMSG(machine *m, int32 *pcOffset) {
frac16 msgValue;
if (!_GWS(myArg2)) {
- ws_Error(m, ERR_MACH, 0x0264, "functionality: send to to all machines of type arg1, message arg2");
+ ws_Error(m, "functionality: send to to all machines of type arg1, message arg2");
}
if (_GWS(myArg3)) {
msgValue = *_GWS(myArg3);
@@ -433,7 +430,7 @@ static bool op_REPLY_MSG(machine *m, int32 *pcOffset) {
frac16 msgValue;
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0263, "functionality: reply to sender with msg arg1");
+ ws_Error(m, "functionality: reply to sender with msg arg1");
}
if (_GWS(myArg2)) {
msgValue = *_GWS(myArg2);
@@ -447,7 +444,7 @@ static bool op_REPLY_MSG(machine *m, int32 *pcOffset) {
static bool op_SYSTEM_MSG(machine *m, int32 *pcOffset) {
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0263, "functionality: send to 'C' callback function with msg arg1");
+ ws_Error(m, "functionality: send to 'C' callback function with msg arg1");
}
if (m->CintrMsg) {
@@ -462,7 +459,7 @@ static bool op_TRIG(machine *m, int32 *pcOffset) {
char tempStr[80];
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0263, "functionality: trigger mach arg1, arg2 instances");
+ ws_Error(m, "functionality: trigger mach arg1, arg2 instances");
}
if (_GWS(myArg2)) {
@@ -478,7 +475,7 @@ static bool op_TRIG(machine *m, int32 *pcOffset) {
Common::sprintf_s(tempStr, "*** TRIGGERED BY MACHINE: %d", m->myHash);
for (int32 i = 0; i < myCount; i++) {
if (!TriggerMachineByHash(*_GWS(myArg1) >> 16, m->myAnim8, -1, -1, m->CintrMsg, false, tempStr)) {
- ws_Error(m, ERR_MACH, 0x0267, "trig() failed");
+ ws_Error(m, "trig() failed");
}
}
@@ -493,7 +490,7 @@ static bool op_TRIG_W(machine *m, int32 *pcOffset) {
uint32 *myPC;
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0263, "functionality: trigger mach arg1, arg2 instances");
+ ws_Error(m, "functionality: trigger mach arg1, arg2 instances");
}
const int32 myHash = (*_GWS(myArg1)) >> 16;
@@ -517,7 +514,7 @@ static bool op_TRIG_W(machine *m, int32 *pcOffset) {
dbg_SetCurrMachInstr(m, *pcOffset, false);
if ((myInstruction = ws_PreProcessPcode(&myPC, m->myAnim8)) < 0) {
- ws_Error(m, ERR_MACH, 0x0266, "trig_w() failed.");
+ ws_Error(m, "trig_w() failed.");
}
dbg_EndCurrMachInstr();
@@ -526,7 +523,7 @@ static bool op_TRIG_W(machine *m, int32 *pcOffset) {
*pcOffset += (byte *)myPC - (byte *)oldPC;
if (!_GWS(myArg1)) {
- ws_Error(m, ERR_MACH, 0x0263, "trig_w instruction requires a data hash specified by a second pCode.");
+ ws_Error(m, "trig_w instruction requires a data hash specified by a second pCode.");
}
const int32 myDataHash = (int32)(*_GWS(myArg1)) >> 16;
@@ -552,7 +549,7 @@ static bool op_TRIG_W(machine *m, int32 *pcOffset) {
for (i = 0; i < myCount; i++) {
Common::sprintf_s(tempStr, "*** TRIGGERED BY MACHINE: %d", m->myHash);
if (!TriggerMachineByHash(myHash, m->myAnim8, myDataHash, myIndex, m->CintrMsg, false, tempStr)) {
- ws_Error(m, ERR_MACH, 0x0267, "trig_w() failed");
+ ws_Error(m, "trig_w() failed");
}
}
}
@@ -564,7 +561,7 @@ static bool op_TRIG_W(machine *m, int32 *pcOffset) {
for (i = 0; i < myCount; i++) {
Common::sprintf_s(tempStr, "*** TRIGGERED BY MACHINE: %d", m->myHash);
if (!TriggerMachineByHash(myHash, m->myAnim8, myDataHash, myIndex, m->CintrMsg, false, tempStr)) {
- ws_Error(m, ERR_MACH, 0x0267, "trig_w() failed");
+ ws_Error(m, "trig_w() failed");
}
}
}
@@ -573,7 +570,7 @@ static bool op_TRIG_W(machine *m, int32 *pcOffset) {
static bool op_CLEAR_REGS(machine *m, int32 *pcOffset) {
if (!m->myAnim8) {
- ws_Error(m, ERR_INTERNAL, 0x02f3, "clear_regs() failed.");
+ ws_Error(m, "clear_regs() failed.");
}
Anim8 *myAnim8 = m->myAnim8;
@@ -588,7 +585,7 @@ static bool op_CLEAR_REGS(machine *m, int32 *pcOffset) {
static bool op_RESUME_SEQ(machine *m, int32 *pcOffset) {
if (!m->myAnim8) {
- ws_Error(m, ERR_INTERNAL, 0x02f3, "resume_seq() failed.");
+ ws_Error(m, "resume_seq() failed.");
}
ws_ResumeAnim8(m->myAnim8);
@@ -642,7 +639,6 @@ void addPauseTime(int32 myTime) {
void cycleEngines(Buffer *cleanBackground, int16 *depth_table, Buffer *screenCodes,
uint8 *myPalette, uint8 *ICT, bool updateVideo) {
- dbg_DebugNextCycle();
const int32 clockTime = timer_read_60();
if (_GWS(enginesPaused)) {
@@ -707,8 +703,6 @@ static void shutdownMachine(machine *m) {
return;
}
- dbg_RemoveWSMach(m);
-
if (m->myAnim8) {
ws_RemoveAnim8FromCruncher(m->myAnim8);
}
@@ -864,7 +858,7 @@ static int32 StepAt(int32 *pcOffset, machine *m) {
dbg_SetCurrMachInstr(m, *pcOffset, false);
if ((myInstruction = ws_PreProcessPcode(&myPC, myAnim8)) < 0) {
- ws_Error(m, ERR_MACH, 0x0266, nullptr);
+ ws_Error(m, nullptr);
}
dbg_EndCurrMachInstr();
@@ -937,7 +931,7 @@ void ws_StepWhile(machine *m, int32 pcOffset, int32 pcCount) {
void IntoTheState(machine *m) {
if ((m->curState >= m->numOfStates) || (m->curState < 0)) {
- ws_Error(m, ERR_INTERNAL, 0x2f2, "IntoTheState() failed.");
+ ws_Error(m, "IntoTheState() failed.");
}
uint32 *stateTable = (uint32 *)((intptr)(*(m->machHandle)) + (intptr)m->stateTableOffset);
@@ -1017,8 +1011,6 @@ machine *TriggerMachineByHash(int32 myHash, Anim8 *parentAnim8, int32 dataHash,
m->usedPersistentMsgs = nullptr;
m->walkPath = nullptr;
- dbg_DebugWSMach(m, debug);
-
IntoTheState(m);
return m;
}
More information about the Scummvm-git-logs
mailing list