diff options
Diffstat (limited to 'src/game/base')
| -rw-r--r-- | src/game/base/game.cc | 22 | ||||
| -rw-r--r-- | src/game/base/planet.cc | 2 | ||||
| -rw-r--r-- | src/game/base/shipdealer.cc | 6 | ||||
| -rw-r--r-- | src/game/base/station.cc | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc index ed1b80e..35dfc5f 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -82,8 +82,8 @@ void Game::func_join(core::Player *player, std::string const &args) core::Entity *dock = ship->zone()->default_view(); if (dock) { - ship->entity_location.assign(dock->location() + (dock->axis().forward() * ((ship->radius()+ dock->radius())*2.0f))); - ship->entity_axis.assign(dock->axis()); + ship->get_location().assign(dock->location() + (dock->axis().forward() * ((ship->radius()+ dock->radius())*2.0f))); + ship->get_axis().assign(dock->axis()); ship->set_state(core::Entity::Docked); player->set_view(dock); } @@ -237,8 +237,8 @@ void Game::func_launch(core::Player *player, std::string const &args) Ship *ship = static_cast<Ship *>(player->control()); ship->shutdown_physics(); core::Entity *dock = player->view(); - ship->entity_location.assign(dock->location() + (dock->axis().forward() * (ship->radius()+ dock->radius()))); - ship->entity_axis.assign(dock->axis()); + 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); ship->init_physics(ship->radius()); ship->set_state(core::Entity::Jump); @@ -265,14 +265,14 @@ void Game::func_respawn(core::Player *player, std::string const &args) ship->shutdown_physics(); if (dock) { - ship->entity_location.assign(dock->location() + (dock->axis().forward() * ((ship->radius()+ dock->radius())))); - ship->entity_axis.assign(dock->axis()); + ship->get_location().assign(dock->location() + (dock->axis().forward() * ((ship->radius()+ dock->radius())))); + ship->get_axis().assign(dock->axis()); ship->set_state(core::Entity::Docked); player->set_view(dock); player->send("^BRespawning at " + dock->name()); } else { - ship->location().clear(); - ship->axis().clear(); + ship->get_location().clear(); + ship->get_axis().clear(); ship->set_state(core::Entity::Jump); player->set_view(0); player->send("^BRespawning"); @@ -303,9 +303,9 @@ void Game::func_goto(core::Player *player, const std::string &args) if (dock) { ship->shutdown_physics(); - ship->entity_location.assign(dock->location() + (dock->axis().forward() * (ship->radius()+dock->radius()))); - ship->entity_axis.assign(dock->axis()); - ship->entity_axis.change_direction(180.0f); + ship->get_location().assign(dock->location() + (dock->axis().forward() * (ship->radius()+dock->radius()))); + ship->get_axis().assign(dock->axis()); + ship->get_axis().change_direction(180.0f); ship->set_state(core::Entity::Normal); ship->init_physics(ship->radius()); diff --git a/src/game/base/planet.cc b/src/game/base/planet.cc index 3242f15..60885b1 100644 --- a/src/game/base/planet.cc +++ b/src/game/base/planet.cc @@ -52,7 +52,7 @@ void Planet::dock(core::Entity *entity) return; } - ship->location().assign(entity->location()); + ship->get_location().assign(entity->location()); ship->set_state(core::Entity::Docked); if (ship->owner() && ship->owner()->control() == ship) { diff --git a/src/game/base/shipdealer.cc b/src/game/base/shipdealer.cc index feef432..408ae43 100644 --- a/src/game/base/shipdealer.cc +++ b/src/game/base/shipdealer.cc @@ -132,10 +132,10 @@ void ShipDealer::func_buy(core::Player *player, const std::string &args) Ship * ship = new Ship(player, shipmodel); if (dock) { ship->set_zone(dock->zone()); - ship->location().assign(dock->location()); + ship->get_location().assign(dock->location()); ship->set_state(core::Entity::Docked); - ship->entity_axis.assign(dock->axis()); - ship->entity_axis.change_direction(180.0f); + ship->get_axis().assign(dock->axis()); + ship->get_axis().change_direction(180.0f); player->set_control(ship); player->set_view(dock); } else { diff --git a/src/game/base/station.cc b/src/game/base/station.cc index 67c1595..0552269 100644 --- a/src/game/base/station.cc +++ b/src/game/base/station.cc @@ -48,7 +48,7 @@ void Station::dock(core::Entity *entity) return; } - ship->location().assign(entity->location()); + ship->get_location().assign(entity->location()); ship->set_state(core::Entity::Docked); if (ship->owner() && ship->owner()->control() == ship) { |