diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-12 16:24:17 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-12 16:24:17 +0000 |
| commit | b460b3193e54b7364bb75ff26ce6f999887e454b (patch) | |
| tree | d35e4972fd3ee54b9922908e3791a53bae96af14 /src/core/parser.cc | |
| parent | c0c2a0ccc335b00983bf69b99b7a44505ed24b47 (diff) | |
moved global entity info type to core::Entity::infotype(),
automatic generation of jumppoint and jumpgate names and descriptions,
prepared game code for the seperation of Entity::radius() and Model::radius()
Diffstat (limited to 'src/core/parser.cc')
| -rw-r--r-- | src/core/parser.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/core/parser.cc b/src/core/parser.cc index 3806b99..953cd50 100644 --- a/src/core/parser.cc +++ b/src/core/parser.cc @@ -11,18 +11,6 @@ namespace core { -InfoType *Parser::entity_infotype = 0; - -void Parser::init() -{ - entity_infotype = new InfoType("entity"); -} - -void Parser::done() -{ - entity_infotype = 0; -} - bool Parser::got_entity_key(filesystem::IniFile &inifile, core::Entity *entity) { math::Vector3f v; @@ -60,7 +48,7 @@ bool Parser::got_entity_key(filesystem::IniFile &inifile, core::Entity *entity) } else if (inifile.got_key_string("info", strval)) { if (!entity->info()) { - entity->set_info(new Info(entity_infotype, entity->label().c_str())); + entity->set_info(new Info(Entity::infotype(), entity->label().c_str())); } entity->info()->add_text(strval); return true; |