diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-24 23:00:28 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-24 23:00:28 +0000 |
| commit | 02b285bf20603bab6fc75d106acbaccead645eb9 (patch) | |
| tree | 7be22d06339e1bb70b7ef5011312c13865976ced /src/game/base | |
| parent | f66a28a68114f3c9efe109b6948ecec163cdb153 (diff) | |
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
Diffstat (limited to 'src/game/base')
| -rw-r--r-- | src/game/base/game.cc | 6 | ||||
| -rw-r--r-- | src/game/base/planet.cc | 3 | ||||
| -rw-r--r-- | src/game/base/star.cc | 3 |
3 files changed, 4 insertions, 8 deletions
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); diff --git a/src/game/base/planet.cc b/src/game/base/planet.cc index 8723af4..2adb1fb 100644 --- a/src/game/base/planet.cc +++ b/src/game/base/planet.cc @@ -17,10 +17,9 @@ Planet::Planet() : core::EntityGlobe() get_color().assign(1.0f, 1.0f); // white set_radius(64.0f); // 64 game units + set_rotationspeed(1.0f); // default rotationspeed: 1 degree per second entity_moduletypeid = planet_enttype; - - entity_rotationspeed = 1.0f; } Planet::~Planet() diff --git a/src/game/base/star.cc b/src/game/base/star.cc index 6327223..c54788a 100644 --- a/src/game/base/star.cc +++ b/src/game/base/star.cc @@ -21,6 +21,9 @@ Star::Star() : core::EntityGlobe() set_radius(96.0f); entity_moduletypeid = star_enttype; + + // default star corona name + set_coronaname("default"); } Star::~Star() |