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

Correct case for unitvis

Browse source
This commit is contained in:
mdiluzio 2014-12-21 10:45:08 +00:00
parent f55bc5413a
commit 4aa51a64b6
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
source/game/unit.h
View file

@ -18,7 +18,7 @@ class CUnit
public:
// Factory function for creating units from a visual
static CUnit GetUnitFromVis( unitVis_c vis );
static CUnit GetUnitFromVis( unitvis_c vis );
// Unit <--> string conversion functions
static std::string GetStringFromUnit(const CUnit& unit );
@ -37,13 +37,13 @@ public:
// Getters for all the members
inline const unit_id_t& GetID() const { return unit_id; }
inline const Team & GetTeam() const { return team_id; }
inline const unitVis_c& GetVisual() const { return unit_vis; }
inline const unitvis_c & GetVisual() const { return unit_vis; }
inline const dir_t& GetDir() const { return dir; }
inline const uvector2& GetPos() const { return pos; }
// Set
inline Team SetTeam(const Team &v) { return (team_id = v); }
inline unitVis_c SetVisual(const unitVis_c &v) { return ( unit_vis = v ); }
inline unitvis_c SetVisual(const unitvis_c &v) { return ( unit_vis = v ); }
inline dir_t SetDir(const dir_t &v) { return (dir = v); }
inline void SetPos(const uvector2 &v) { pos = v; }
@ -54,7 +54,7 @@ public:
inline bool Valid() const;
// Set a unit based solely on it's visual
bool SetFromVisual(const unitVis_c &vis);
bool SetFromVisual(const unitvis_c &vis);
// Orientation methods
dir_t TurnLeft();
@ -64,13 +64,13 @@ public:
private:
// Update my visual must be called when setting direction
unitVis_c UpdateMyVisual();
unitvis_c UpdateMyVisual();
// Unit ID
unit_id_t unit_id;
// Visual
unitVis_c unit_vis;
unitvis_c unit_vis;
// Team ID
Team team_id;
@ -91,7 +91,7 @@ inline bool CUnit::Valid() const
{
return (unit_id != unit_id_invalid )
&& (team_id != Team::NUM_INVALID )
&& (unit_vis != unitVis_invalid);
&& (unit_vis != unitvis_invalid);
}
#endif //_UNIT_H_