diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-08-15 14:03:22 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-08-15 14:03:22 +0000 |
| commit | 8a4eb790261737104be262cdeab4b0e7d0f5566d (patch) | |
| tree | 506c094bda41d934fae5bdb7d253c147c1d62964 /src/game | |
| parent | 62de0496836e729ff955274cf153914709775bfb (diff) | |
render dock locations on active targets, fix star texture loading and rendering
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/game.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/game.cc b/src/game/game.cc index ca06c81..5f754df 100644 --- a/src/game/game.cc +++ b/src/game/game.cc @@ -345,6 +345,7 @@ bool Game::load_zone(core::Zone *zone) con_warn << zoneini.name() << " unknown key '" << zoneini.key() << "' at line " << zoneini.line() << std::endl; } } else if (zoneini.section().compare("star") == 0) { + if (zoneini.got_key_string("label", strval)) { aux::to_label(strval); star->entity_label.assign(strval); @@ -358,12 +359,12 @@ bool Game::load_zone(core::Zone *zone) } else if (zoneini.got_key_angle("radius", star->entity_radius)) { continue; } else if (zoneini.got_key_angle("direction", direction)) { - planet->axis().change_direction(direction); + star->axis().change_direction(direction); continue; - } else if (zoneini.got_key_string("texture", planet->entity_texture)) { + } else if (zoneini.got_key_string("texture", star->entity_texture)) { continue; } else if (zoneini.got_key_angle("pitch", pitch)) { - planet->axis().change_pitch(pitch); + star->axis().change_pitch(pitch); continue; } else { con_warn << zoneini.name() << " unknown key '" << zoneini.key() << "' at line " << zoneini.line() << std::endl; |