Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/parser.cc')
-rw-r--r--src/core/parser.cc10
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);