diff options
Diffstat (limited to 'src/game/base/game.cc')
-rw-r--r-- | src/game/base/game.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc index d99f80c..9d2dcd0 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -719,9 +719,9 @@ void Game::func_launch(core::Player *player, std::string const &args) Ship *ship = static_cast<Ship *>(player->control()); if (dock->type() == core::Entity::Globe) - ship->get_location().assign(dock->location() + (dock->axis().forward() *(planet_safe_distance + ship->radius() + dock->radius()))); + ship->get_location().assign(dock->location() + (dock->axis().forward() * (planet_safe_distance + ship->radius() + dock->radius()))); else - ship->get_location().assign(dock->location() + (dock->axis().forward() *(ship->radius() + dock->radius()))); + ship->get_location().assign(dock->location() + (dock->axis().forward() * (ship->radius() + dock->radius()))); ship->get_axis().assign(dock->axis()); ship->set_state(core::Entity::Normal); @@ -1065,7 +1065,6 @@ bool Game::load_zone(core::Zone *zone) } else if (zoneini.got_section("entity")) { entity = new core::Entity(); - entity->set_flag(core::Entity::Static); entity->set_zone(zone); count ++; @@ -1268,11 +1267,9 @@ bool Game::load_zone(core::Zone *zone) } } } + zoneini.close(); - con_debug << " " << zoneini.name() << " " << zone->content().size() << " entities" << std::endl; - - return true; } @@ -1290,7 +1287,6 @@ bool Game::validate_zone(core::Zone *zone) // validate jump gate JumpGate *jumpgate = static_cast<JumpGate *>(entity); jumpgate->validate(); - } else { if ((entity->flags() & core::Entity::Dockable) == core::Entity::Dockable) { generate_entity_menus(entity); |