zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded index restriction from GetUDMFInt/Fixed

This commit is contained in:
Randy Heit 2015-02-20 20:42:30 -06:00
parent a64ebc720b
commit 9721c025c1
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/p_udmf.cpp
View File

@ -343,17 +343,14 @@ int GetUDMFInt(int type, int index, const char *key)
{
assert(type >=0 && type <=3);
if (index > 0)
{
FUDMFKeys *pKeys = UDMFKeys[type].CheckKey(index);
FUDMFKeys *pKeys = UDMFKeys[type].CheckKey(index);
if (pKeys != NULL)
if (pKeys != NULL)
{
FUDMFKey *pKey = pKeys->Find(key);
if (pKey != NULL)
{
FUDMFKey *pKey = pKeys->Find(key);
if (pKey != NULL)
{
return pKey->IntVal;
}
return pKey->IntVal;
}
}
return 0;
@ -363,17 +360,14 @@ fixed_t GetUDMFFixed(int type, int index, const char *key)
{
assert(type >=0 && type <=3);
if (index > 0)
{
FUDMFKeys *pKeys = UDMFKeys[type].CheckKey(index);
FUDMFKeys *pKeys = UDMFKeys[type].CheckKey(index);
if (pKeys != NULL)
if (pKeys != NULL)
{
FUDMFKey *pKey = pKeys->Find(key);
if (pKey != NULL)
{
FUDMFKey *pKey = pKeys->Find(key);
if (pKey != NULL)
{
return FLOAT2FIXED(pKey->FloatVal);
}
return FLOAT2FIXED(pKey->FloatVal);
}
}
return 0;