Rename some UDMF fields whose names have different meanings in other UDMF implementations
This commit is contained in:
parent
97c58957ee
commit
60cde39042
|
@ -116,7 +116,7 @@ thingflags_udmf
|
||||||
{
|
{
|
||||||
extra = "Extra";
|
extra = "Extra";
|
||||||
flip = "Flip";
|
flip = "Flip";
|
||||||
special = "Special";
|
objectspecial = "Special";
|
||||||
ambush = "Ambush";
|
ambush = "Ambush";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,7 +128,7 @@ thingflagstranslation
|
||||||
{
|
{
|
||||||
1 = "extra";
|
1 = "extra";
|
||||||
2 = "flip";
|
2 = "flip";
|
||||||
4 = "special";
|
4 = "objectspecial";
|
||||||
8 = "ambush";
|
8 = "ambush";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1443,21 +1443,18 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val)
|
||||||
P_SetLinedefV2(i, atol(val));
|
P_SetLinedefV2(i, atol(val));
|
||||||
else if (fastncmp(param, "arg", 3) && strlen(param) > 3)
|
else if (fastncmp(param, "arg", 3) && strlen(param) > 3)
|
||||||
{
|
{
|
||||||
if (fastcmp(param + 4, "str"))
|
size_t argnum = atol(param + 3);
|
||||||
{
|
if (argnum >= NUMLINEARGS)
|
||||||
size_t argnum = param[3] - '0';
|
return;
|
||||||
if (argnum >= NUMLINESTRINGARGS)
|
lines[i].args[argnum] = atol(val);
|
||||||
return;
|
}
|
||||||
lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
|
else if (fastncmp(param, "stringarg", 9) && strlen(param) > 9)
|
||||||
M_Memcpy(lines[i].stringargs[argnum], val, strlen(val) + 1);
|
{
|
||||||
}
|
size_t argnum = param[9] - '0';
|
||||||
else
|
if (argnum >= NUMLINESTRINGARGS)
|
||||||
{
|
return;
|
||||||
size_t argnum = atol(param + 3);
|
lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
|
||||||
if (argnum >= NUMLINEARGS)
|
M_Memcpy(lines[i].stringargs[argnum], val, strlen(val) + 1);
|
||||||
return;
|
|
||||||
lines[i].args[argnum] = atol(val);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (fastcmp(param, "sidefront"))
|
else if (fastcmp(param, "sidefront"))
|
||||||
lines[i].sidenum[0] = atol(val);
|
lines[i].sidenum[0] = atol(val);
|
||||||
|
@ -1517,7 +1514,7 @@ static void ParseTextmapThingParameter(UINT32 i, char *param, char *val)
|
||||||
mapthings[i].options |= MTF_EXTRA;
|
mapthings[i].options |= MTF_EXTRA;
|
||||||
else if (fastcmp(param, "flip") && fastcmp("true", val))
|
else if (fastcmp(param, "flip") && fastcmp("true", val))
|
||||||
mapthings[i].options |= MTF_OBJECTFLIP;
|
mapthings[i].options |= MTF_OBJECTFLIP;
|
||||||
else if (fastcmp(param, "special") && fastcmp("true", val))
|
else if (fastcmp(param, "objectspecial") && fastcmp("true", val))
|
||||||
mapthings[i].options |= MTF_OBJECTSPECIAL;
|
mapthings[i].options |= MTF_OBJECTSPECIAL;
|
||||||
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;
|
||||||
|
|
Loading…
Reference in New Issue