Save and load player inventories,

corrected a typo in saving the forward vector of the ship axis.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc
index 0bc1b7c..459b8fd 100644
--- a/src/game/base/ship.cc
+++ b/src/game/base/ship.cc
@@ -299,20 +299,22 @@ void Ship::set_state(int state)
 	if (state != core::Entity::Docked)
 		ship_dock = 0;
 }
+
 void Ship::set_dock(core::Entity *dock)
 {
 	if (!dock)
 		return;
 	
-	ship_dock = dock;
 	get_location().assign(dock->location());
 	get_axis().assign(dock->axis());
+	ship_dock = dock;
 	set_state(core::Entity::Docked);
 	
 	// if the dock is not owned by a player. set it as spawn
 	const core::Player *owner = (dock->type() == core::Entity::Controlable ? static_cast<core::EntityControlable *>(dock)->owner() : 0 );
 	if (!owner)
 		set_spawn(dock);
+	
 	reset();
 }