lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Follow GZDoom's convention for stringargs.

Browse source
This commit is contained in:
Nev3r 2020-12-01 18:35:24 +01:00
parent d004515d6a
commit c8ae28bbaf
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_setup.c
View file

@ -1628,9 +1628,9 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val)
return; return;
lines[i].args[argnum] = atol(val); lines[i].args[argnum] = atol(val);
} }
else if (fastncmp(param, "stringarg", 9) && strlen(param) > 9) else if (strlen(param) == 7 && fastncmp(param, "arg", 3) && fastncmp(param + 4, "str", 3))
{ {
size_t argnum = param[9] - '0'; size_t argnum = param[3] - '0';
if (argnum >= NUMLINESTRINGARGS) if (argnum >= NUMLINESTRINGARGS)
return; return;
lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL); lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
@ -1727,9 +1727,9 @@ static void ParseTextmapThingParameter(UINT32 i, char *param, char *val)
return; return;
mapthings[i].args[argnum] = atol(val); mapthings[i].args[argnum] = atol(val);
} }
else if (fastncmp(param, "stringarg", 9) && strlen(param) > 9) else if (strlen(param) == 7 && fastncmp(param, "arg", 3) && fastncmp(param + 4, "str", 3))
{ {
size_t argnum = param[9] - '0'; size_t argnum = param[3] - '0';
if (argnum >= NUMMAPTHINGSTRINGARGS) if (argnum >= NUMMAPTHINGSTRINGARGS)
return; return;
mapthings[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL); mapthings[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);