zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: 'None' was no longer recognized as a NULL class name by the

Browse source 
DECORATE parser.


SVN r1347 (trunk)
This commit is contained in:
Christoph Oelckers 2009-01-03 14:44:41 +00:00
parent 35edd15386
commit fdfee91b9f
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/rh-log.txt
View file

@ -1,3 +1,7 @@
January 3, 2009 (Changes by Graf Zahl)
- Fixed: 'None' was no longer recognized as a NULL class name by the
DECORATE parser.
January 1, 2009 (Changes by Graf Zahl) January 1, 2009 (Changes by Graf Zahl)
- Added 'ininventory item, amount' option to SBARINFO to check for a minimum - Added 'ininventory item, amount' option to SBARINFO to check for a minimum
amount instead of mere presence in the inventory. amount instead of mere presence in the inventory.

8
src/thingdef/thingdef_properties.cpp
View file

@ -77,8 +77,14 @@
//========================================================================== //==========================================================================
static const PClass *FindClassTentative(const char *name, const char *ancestor) static const PClass *FindClassTentative(const char *name, const char *ancestor)
{ {
// "" and "none" mean 'no class'
if (name == NULL || *name == 0 || !stricmp(name, "none"))
{
return NULL;
}
const PClass *anc = PClass::FindClass(ancestor); const PClass *anc = PClass::FindClass(ancestor);
assert(anc != NULL); // parent classes used here should always be natively defined assert(anc != NULL); // parent classes used here should always be natively defined
const PClass *cls = const_cast<PClass*>(anc)->FindClassTentative(name); const PClass *cls = const_cast<PClass*>(anc)->FindClassTentative(name);
assert (cls != NULL); // cls can not ne NULL here assert (cls != NULL); // cls can not ne NULL here
if (!cls->IsDescendantOf(anc)) if (!cls->IsDescendantOf(anc))