mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-28 06:53:40 +00:00
- Fixed: 'None' was no longer recognized as a NULL class name by the
DECORATE parser. SVN r1347 (trunk)
This commit is contained in:
parent
35edd15386
commit
fdfee91b9f
2 changed files with 11 additions and 1 deletions
|
@ -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)
|
||||
- Added 'ininventory item, amount' option to SBARINFO to check for a minimum
|
||||
amount instead of mere presence in the inventory.
|
||||
|
|
|
@ -77,8 +77,14 @@
|
|||
//==========================================================================
|
||||
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);
|
||||
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);
|
||||
assert (cls != NULL); // cls can not ne NULL here
|
||||
if (!cls->IsDescendantOf(anc))
|
||||
|
|
Loading…
Reference in a new issue