eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Review opGetMessageString

This commit is contained in:
Alexander Batalov 2022-10-05 16:07:55 +03:00
parent 7ddd8f2894
commit d03fd5e43f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/interpreter_extra.cc
View File

@ -339,9 +339,6 @@ static void opTileGetObjectWithPid(Program* program);
static void opGetObjectName(Program* program); static void opGetObjectName(Program* program);
static void opGetPcStat(Program* program); static void opGetPcStat(Program* program);
// 0x504B04
static char _Error_0[] = "Error";
// 0x504B0C // 0x504B0C
static char _aCritter[] = "<Critter>"; static char _aCritter[] = "<Critter>";
@ -407,9 +404,6 @@ static const int _ftList[11] = {
ANIM_FALL_FRONT_BLOOD_SF, ANIM_FALL_FRONT_BLOOD_SF,
}; };
// 0x518EFC
static char* _errStr = _Error_0;
// Last message type during op_float_msg sequential. // Last message type during op_float_msg sequential.
// //
// 0x518F00 // 0x518F00
@ -2978,6 +2972,9 @@ static void opGetProtoData(Program* program)
// 0x458E10 // 0x458E10
static void opGetMessageString(Program* program) static void opGetMessageString(Program* program)
{ {
// 0x518EFC
static char errStr[] = "Error";
int messageIndex = programStackPopInteger(program); int messageIndex = programStackPopInteger(program);
int messageListIndex = programStackPopInteger(program); int messageListIndex = programStackPopInteger(program);
@ -2986,10 +2983,10 @@ static void opGetMessageString(Program* program)
string = _scr_get_msg_str_speech(messageListIndex, messageIndex, 1); string = _scr_get_msg_str_speech(messageListIndex, messageIndex, 1);
if (string == NULL) { if (string == NULL) {
debugPrint("\nError: No message file EXISTS!: index %d, line %d", messageListIndex, messageIndex); debugPrint("\nError: No message file EXISTS!: index %d, line %d", messageListIndex, messageIndex);
string = _errStr; string = errStr;
} }
} else { } else {
string = _errStr; string = errStr;
} }
programStackPushString(program, string); programStackPushString(program, string);