Skip to content

Commit cb587f5

Browse files
Fixed crash with invalid ids with npcdata
1 parent 6b67443 commit cb587f5

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/zc/ffscript.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11862,7 +11862,7 @@ int32_t get_register(const int32_t arg)
1186211862
{ \
1186311863
if( (unsigned) ri->npcdataref > (MAXNPCS-1) ) \
1186411864
{ \
11865-
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", (ri->npcdataref*10000), str); \
11865+
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", str, (ri->npcdataref*10000)); \
1186611866
ret = -10000; \
1186711867
} \
1186811868
else \
@@ -11875,7 +11875,7 @@ int32_t get_register(const int32_t arg)
1187511875
{ \
1187611876
if( (unsigned) ri->npcdataref > (MAXNPCS-1) ) \
1187711877
{ \
11878-
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", (ri->npcdataref*10000), str); \
11878+
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", str, (ri->npcdataref*10000)); \
1187911879
ret = -10000; \
1188011880
} \
1188111881
else \
@@ -11888,7 +11888,7 @@ int32_t get_register(const int32_t arg)
1188811888
{ \
1188911889
if( (unsigned) ri->npcdataref > (MAXNPCS-1) ) \
1189011890
{ \
11891-
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", (ri->npcdataref*10000), str); \
11891+
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", str, (ri->npcdataref*10000)); \
1189211892
ret = -10000; \
1189311893
} \
1189411894
else \
@@ -11902,12 +11902,12 @@ int32_t get_register(const int32_t arg)
1190211902
int32_t indx = ri->d[rINDEX] / 10000; \
1190311903
if( (unsigned) ri->npcdataref > (MAXNPCS-1) ) \
1190411904
{ \
11905-
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", (ri->npcdataref*10000), str); \
11905+
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", str, (ri->npcdataref*10000)); \
1190611906
ret = -10000; \
1190711907
} \
1190811908
else if ( (unsigned)indx > indexbound ) \
1190911909
{ \
11910-
Z_scripterrlog("Invalid Array Index passed to npcdata->%s: %d\n", indx, str); \
11910+
Z_scripterrlog("Invalid Array Index passed to npcdata->%s: %d\n", str, indx); \
1191111911
ret = -10000; \
1191211912
} \
1191311913
else \
@@ -11921,12 +11921,12 @@ int32_t get_register(const int32_t arg)
1192111921
int32_t indx = ri->d[rINDEX] / 10000; \
1192211922
if( (unsigned) ri->npcdataref > (MAXNPCS-1) ) \
1192311923
{ \
11924-
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", (ri->npcdataref*10000), str); \
11924+
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", str, (ri->npcdataref*10000)); \
1192511925
ret = -10000; \
1192611926
} \
1192711927
else if ( (unsigned)indx > indexbound ) \
1192811928
{ \
11929-
Z_scripterrlog("Invalid Array Index passed to npcdata->%s: %d\n", indx, str); \
11929+
Z_scripterrlog("Invalid Array Index passed to npcdata->%s: %d\n", str, indx); \
1193011930
ret = -10000; \
1193111931
} \
1193211932
else \
@@ -11940,7 +11940,7 @@ int32_t get_register(const int32_t arg)
1194011940
int32_t flag = (value/10000); \
1194111941
if( (unsigned) ri->npcdataref > (MAXNPCS-1) ) \
1194211942
{ \
11943-
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", (ri->npcdataref*10000), str); \
11943+
Z_scripterrlog("Invalid NPC ID passed to npcdata->%s: %d\n", str, (ri->npcdataref*10000)); \
1194411944
} \
1194511945
else \
1194611946
{ \

0 commit comments

Comments
 (0)