From 2f17a17587aa0a4370ea888b18be521412363485 Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <mdiluzio@feralinteractive.com>
Date: Tue, 16 Dec 2014 13:13:01 +0000
Subject: [PATCH] fix using move semantics for no reason

---
 game/unit.cpp | 6 +++---
 game/unit.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/game/unit.cpp b/game/unit.cpp
index 03b16b7..30bc711 100644
--- a/game/unit.cpp
+++ b/game/unit.cpp
@@ -51,11 +51,11 @@ CUnit::CUnit(CUnit&& unit)
 	updateMyVisual();
 }
 
-CUnit&& CUnit::getUnitFromVis( unitVis_c vis )
+CUnit CUnit::getUnitFromVis( unitVis_c vis )
 {
 	CUnit unit;
 	unit.setFromVisual(vis);
-	return std::move(unit);
+    return unit;
 }
 
 // Update the visual representation of the unit
@@ -89,4 +89,4 @@ bool CUnit::setFromVisual( const unitVis_c& vis )
 
 	// No matching direction to visual
 	return false;
-}
\ No newline at end of file
+}
diff --git a/game/unit.h b/game/unit.h
index c1b51c9..cc211c8 100644
--- a/game/unit.h
+++ b/game/unit.h
@@ -36,7 +36,7 @@ public:
 	bool 		setFromVisual( const unitVis_c& vis);
 
 	// Factory function for creating units from a visual
-	static CUnit&& getUnitFromVis( unitVis_c vis );
+    static CUnit getUnitFromVis( unitVis_c vis );
 
 
 protected:
@@ -75,4 +75,4 @@ inline bool CUnit::valid() const
 		&& (unit_vis 	!= unitVis_invalid);
 }
 
-#endif //_UNIT_H_
\ No newline at end of file
+#endif //_UNIT_H_