From 02b285bf20603bab6fc75d106acbaccead645eb9 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 24 Nov 2010 23:00:28 +0000 Subject: Actually add entities in the intro to their zone, removed core::EntityControlable::movement(), cleaned up core::EntityGlobe, adds support for a per-globe corona, adds core::EntityControlable::control_flags(), bumps network protocol version to 21 --- src/game/base/game.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/game/base/game.cc') diff --git a/src/game/base/game.cc b/src/game/base/game.cc index 7ed01e1..108c13f 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -1232,8 +1232,6 @@ bool Game::load_zone(core::Zone *zone) } else if (zoneini.in_section("star")) { if (core::Parser::got_entity_key(zoneini, star)) { continue; - } else if (zoneini.got_key_string("texture", star->entity_texture)) { - continue; } else { zoneini.unkown_key(); } @@ -1289,10 +1287,6 @@ bool Game::load_zone(core::Zone *zone) } else if (zoneini.in_section("planet")) { if (core::Parser::got_entity_key(zoneini, planet)) { continue; - } else if (zoneini.got_key_string("texture", planet->entity_texture)) { - continue; - } else if (zoneini.got_key_float("rotationspeed", planet->entity_rotationspeed)) { - continue; } else if (zoneini.got_key_bool("dock", b)) { if (b) { planet->set_flag(core::Entity::Dockable); -- cgit v1.2.3