fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactored op_message_str_game2 function to always return a valid string value. Now an "Error" string will be returned on error instead of an uninitialized char pointer or an integer value.

Browse Source
This commit is contained in:
Vennor
2016-05-09 19:10:25 +02:00
parent 90b718122d
commit 2330dd97bb
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/ScriptOps/ScriptUtils.hpp
+7 -9
View File
@@ -862,9 +862,10 @@ static const DWORD* proto_msg_files = (DWORD*)0x006647AC;
static void _stdcall op_message_str_game2() { static void _stdcall op_message_str_game2() {
DWORD fileId = opArgs[0]; DWORD fileId = opArgs[0];
const char* msg = 0;
if (IsOpArgInt(0) && IsOpArgInt(1)) { if (IsOpArgInt(0) && IsOpArgInt(1)) {
int msgId = GetOpArgInt(1); int msgId = GetOpArgInt(1);
const char* msg;
if (fileId < 20) { // main msg files if (fileId < 20) { // main msg files
msg = GetMessageStr(game_msg_files[fileId], msgId); msg = GetMessageStr(game_msg_files[fileId], msgId);
} }
@@ -876,16 +877,13 @@ static void _stdcall op_message_str_game2() {
if (it != gExtraGameMsgLists.end()) if (it != gExtraGameMsgLists.end())
msg = GetMsg(it->second, msgId, 2); msg = GetMsg(it->second, msgId, 2);
else
msg = 0;
} }
if (msg != 0)
SetOpReturn(msg);
else
SetOpReturn(0, DATATYPE_INT);
} else {
SetOpReturn(0, DATATYPE_INT);
} }
if (msg == 0)
msg = "Error";
SetOpReturn(msg);
} }
static void __declspec(naked) op_message_str_game() { static void __declspec(naked) op_message_str_game() {