mdiluz/ttrts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix using move semantics for no reason

Browse source
This commit is contained in:
Marc Di Luzio 2014-12-16 13:13:01 +00:00
parent 0c7721cb17
commit 2f17a17587
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
game/unit.cpp
View file

@ -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;
}
}

4
game/unit.h
View file

@ -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_
#endif //_UNIT_H_