From b6eb7bc55c26444dd2bb3ee0e0a669f0b31bceeb Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 5 Nov 2013 10:09:57 +0000
Subject: Assign player name to entity name for player-controlled ships.

---
 src/game/base/ship.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc
index 16c2ea8..e800c93 100644
--- a/src/game/base/ship.cc
+++ b/src/game/base/ship.cc
@@ -78,10 +78,15 @@ Ship::Ship(core::Player *owner, const ShipModel *shipmodel) : core::EntityContro
 		set_owner(owner);
 		get_color().assign(owner->color());
 		get_color_second().assign(owner->color_second());
+		
 		std::string str(aux::text_strip(owner->name()));
 		aux::to_label(str);
 		set_label(str);
 		
+		str.assign(aux::text_strip(owner->name()));
+		aux::text_strip(str);
+		set_name(str);
+		
 		// add an inventory
 		add_inventory();
 		inventory()->set_capacity(ship_shipmodel->maxcargo());
-- 
cgit v1.2.3