diff options
author | Stijn Buys <ingar@osirion.org> | 2011-07-12 14:26:09 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2011-07-12 14:26:09 +0000 |
commit | 8c3abbb3c04c6119b8f0ceb546c3aff66703ba14 (patch) | |
tree | 975ff9f73ef7841763111a0e0dc7065e34e3cbf7 /src/core/parser.cc | |
parent | bbbd41ccf4e7501e93689afecab442cb7e60a5de (diff) |
Removed Entity::Complex flag: collision models will be used if availble,
removed a number of irrelevant comments.
Diffstat (limited to 'src/core/parser.cc')
-rw-r--r-- | src/core/parser.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/parser.cc b/src/core/parser.cc index b210cdd..984d403 100644 --- a/src/core/parser.cc +++ b/src/core/parser.cc @@ -13,6 +13,9 @@ namespace core bool Parser::got_entity_key(filesystem::IniFile &inifile, core::Entity *entity) { + if (!entity) + return false; + math::Vector3f v; math::Color color; @@ -72,13 +75,6 @@ bool Parser::got_entity_key(filesystem::IniFile &inifile, core::Entity *entity) entity->unset_flag(Entity::ShowOnMap); return true; - } else if (inifile.got_key_bool("complex", blnval)) { - if (blnval) - entity->set_flag(Entity::Complex); - else - entity->unset_flag(Entity::Complex); - return true; - } else if (inifile.got_key_bool("nonsolid", blnval)) { if (blnval) entity->set_flag(Entity::NonSolid); |