zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 08:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed UDMF user variables could be set for the base namespaces which do not define them.

Browse source
This commit is contained in:
Christoph Oelckers 2015-04-15 09:43:43 +02:00
parent 902593198b
commit 418e6a16b8
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_udmf.cpp
View file

@ -722,6 +722,7 @@ public:
break; break;
default: default:
CHECK_N(Zd | Zdt)
if (0 == strnicmp("user_", key.GetChars(), 5)) if (0 == strnicmp("user_", key.GetChars(), 5))
{ // Custom user key - Sets an actor's user variable directly { // Custom user key - Sets an actor's user variable directly
FMapThingUserData ud; FMapThingUserData ud;
@ -1041,7 +1042,7 @@ public:
} }
#if 0 // for later #if 0 // for later
if (if (namespace_bits & (Zd)) && !strnicmp(key.GetChars(), "Id", 2)) if (namespace_bits & (Zd)) && !strnicmp(key.GetChars(), "Id", 2))
{ {
char *endp; char *endp;
int num = strtol(key.GetChars(), &endp, 10); int num = strtol(key.GetChars(), &endp, 10);
@ -1053,7 +1054,7 @@ public:
} }
#endif #endif
if (!strnicmp("user_", key.GetChars(), 5)) if ((namespace_bits & (Zd | Zdt)) && !strnicmp("user_", key.GetChars(), 5))
{ {
AddUserKey(key, UDMF_Line, index); AddUserKey(key, UDMF_Line, index);
} }
@ -1239,7 +1240,7 @@ public:
break; break;
} }
if (!strnicmp("user_", key.GetChars(), 5)) if ((namespace_bits & (Zd | Zdt)) && !strnicmp("user_", key.GetChars(), 5))
{ {
AddUserKey(key, UDMF_Side, index); AddUserKey(key, UDMF_Side, index);
} }
@ -1523,7 +1524,7 @@ public:
} }
#endif #endif
if (!strnicmp("user_", key.GetChars(), 5)) if ((namespace_bits & (Zd | Zdt)) && !strnicmp("user_", key.GetChars(), 5))
{ {
AddUserKey(key, UDMF_Sector, index); AddUserKey(key, UDMF_Sector, index);
} }