zone support

1 files changed, 8 insertions, 4 deletions

diff --git a/src/game/ship.cc b/src/game/ship.cc
index 66d8b52..f61c9bd 100644
--- a/src/game/ship.cc
+++ b/src/game/ship.cc
@@ -23,19 +23,23 @@ Ship::Ship(core::Player *owner, ShipModel *shipmodel) :
 	entity_modelname = "ships/" + shipmodel->modelname();
 	entity_name = shipmodel->name() + ": <^B" + owner->name() + "^N>";
 	entity_label = shipmodel->label();
-	ship_shipmodel = shipmodel;
 
 	entity_moduletypeid = ship_enttype;
 
 	current_target_direction = 0.0f;
 	current_target_pitch = 0.0f;;
-	current_target_roll = 0.0f;;
+	current_target_roll = 0.0f;
+
+	entity_color = owner->color();
+	entity_color_second = owner->color_second();
+
+	ship_shipmodel = shipmodel;
+	ship_jumpdrive = shipmodel->shipmodel_jumpdrive;
 }
 
 Ship::~Ship() 
 {
-	if (entity_owner)
-		entity_owner->remove_asset(this);
+
 }
 
 void Ship::frame(float seconds)