From 8c3abbb3c04c6119b8f0ceb546c3aff66703ba14 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 12 Jul 2011 14:26:09 +0000 Subject: Removed Entity::Complex flag: collision models will be used if availble, removed a number of irrelevant comments. --- src/core/parser.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/core/parser.cc') 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); -- cgit v1.2.3