Merge branch 'fixargstr' into 'next'
Fixargstr See merge request STJr/SRB2!1280
This commit is contained in:
commit
413fa89555
|
@ -1621,6 +1621,14 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val)
|
||||||
P_SetLinedefV1(i, atol(val));
|
P_SetLinedefV1(i, atol(val));
|
||||||
else if (fastcmp(param, "v2"))
|
else if (fastcmp(param, "v2"))
|
||||||
P_SetLinedefV2(i, atol(val));
|
P_SetLinedefV2(i, atol(val));
|
||||||
|
else if (strlen(param) == 7 && fastncmp(param, "arg", 3) && fastncmp(param + 4, "str", 3))
|
||||||
|
{
|
||||||
|
size_t argnum = param[3] - '0';
|
||||||
|
if (argnum >= NUMLINESTRINGARGS)
|
||||||
|
return;
|
||||||
|
lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
|
||||||
|
M_Memcpy(lines[i].stringargs[argnum], val, strlen(val) + 1);
|
||||||
|
}
|
||||||
else if (fastncmp(param, "arg", 3) && strlen(param) > 3)
|
else if (fastncmp(param, "arg", 3) && strlen(param) > 3)
|
||||||
{
|
{
|
||||||
size_t argnum = atol(param + 3);
|
size_t argnum = atol(param + 3);
|
||||||
|
@ -1628,14 +1636,6 @@ 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)
|
|
||||||
{
|
|
||||||
size_t argnum = param[9] - '0';
|
|
||||||
if (argnum >= NUMLINESTRINGARGS)
|
|
||||||
return;
|
|
||||||
lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
|
|
||||||
M_Memcpy(lines[i].stringargs[argnum], val, strlen(val) + 1);
|
|
||||||
}
|
|
||||||
else if (fastcmp(param, "sidefront"))
|
else if (fastcmp(param, "sidefront"))
|
||||||
lines[i].sidenum[0] = atol(val);
|
lines[i].sidenum[0] = atol(val);
|
||||||
else if (fastcmp(param, "sideback"))
|
else if (fastcmp(param, "sideback"))
|
||||||
|
@ -1720,6 +1720,14 @@ static void ParseTextmapThingParameter(UINT32 i, char *param, char *val)
|
||||||
else if (fastcmp(param, "ambush") && fastcmp("true", val))
|
else if (fastcmp(param, "ambush") && fastcmp("true", val))
|
||||||
mapthings[i].options |= MTF_AMBUSH;
|
mapthings[i].options |= MTF_AMBUSH;
|
||||||
|
|
||||||
|
else if (strlen(param) == 7 && fastncmp(param, "arg", 3) && fastncmp(param + 4, "str", 3))
|
||||||
|
{
|
||||||
|
size_t argnum = param[3] - '0';
|
||||||
|
if (argnum >= NUMMAPTHINGSTRINGARGS)
|
||||||
|
return;
|
||||||
|
mapthings[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
|
||||||
|
M_Memcpy(mapthings[i].stringargs[argnum], val, strlen(val) + 1);
|
||||||
|
}
|
||||||
else if (fastncmp(param, "arg", 3) && strlen(param) > 3)
|
else if (fastncmp(param, "arg", 3) && strlen(param) > 3)
|
||||||
{
|
{
|
||||||
size_t argnum = atol(param + 3);
|
size_t argnum = atol(param + 3);
|
||||||
|
@ -1727,14 +1735,6 @@ 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)
|
|
||||||
{
|
|
||||||
size_t argnum = param[9] - '0';
|
|
||||||
if (argnum >= NUMMAPTHINGSTRINGARGS)
|
|
||||||
return;
|
|
||||||
mapthings[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
|
|
||||||
M_Memcpy(mapthings[i].stringargs[argnum], val, strlen(val) + 1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** From a given position table, run a specified parser function through a {}-encapsuled text.
|
/** From a given position table, run a specified parser function through a {}-encapsuled text.
|
||||||
|
|
Loading…
Reference in New Issue