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

remove unit inheritence, twas a silly idea, and remove usage of shared ptr and unique ptr not needed anymore

Browse source
This commit is contained in:
Marc Di Luzio 2014-12-16 13:13:01 +00:00
parent 0700a13129
commit 0c7721cb17
8 changed files with 101 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

19
game/unit.h
View file

@ -11,8 +11,10 @@
class CUnit
{
public:
virtual ~CUnit() = default;
CUnit();
CUnit(CUnit&& unit);
~CUnit() = default;
inline const unit_id_t& getID() const { return unit_id; }
inline const team_id_t& getTeam() const { return team_id; }
@ -31,19 +33,20 @@ public:
inline bool valid() const;
// Set a unit based solely on it's visual
// Maybe make non-virtual at some point to avoid vtable lookups
virtual bool setFromVisual(unitVis_c& vis) = 0;
bool setFromVisual( const unitVis_c& vis);
// Factory function for creating units from a visual
static std::unique_ptr<CUnit> getUnitFromVis( unitVis_c vis );
static CUnit&& getUnitFromVis( unitVis_c vis );
protected:
// Protected constructor, cannot be constructed as base type
CUnit();
private:
// Update the visual of V
unitVis_c updateMyVisual();
// Unit ID
const unit_id_t unit_id;
@ -56,8 +59,10 @@ private:
// Owner ID
player_id_t player_id;
// Direction
dir_t dir;
// All units must have position
// Position
uvector2 pos;
};