1 files changed, 11 insertions, 11 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());