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

Player -> player_t

Browse source
This commit is contained in:
mdiluzio 2014-12-21 11:14:01 +00:00
parent 9e44d5144b
commit 83020d9120
8 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/game/unit.h
View file

@ -36,13 +36,13 @@ public:
// Getters for all the members
inline const unit_id_t& GetID() const { return unit_id; }
inline const Player & GetPlayer() const { return player_id; }
inline const player_t & GetPlayer() const { return player_id; }
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 Player SetPlayer(const Player &v) { return (player_id = v); }
inline player_t SetPlayer(const player_t &v) { return (player_id = 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; }
@ -73,7 +73,7 @@ private:
unitvis_c unit_vis;
// Player ID
Player player_id;
player_t player_id;
// Direction
dir_t dir;
@ -90,7 +90,7 @@ typedef std::vector< unit_id_t > CUnitIDVector;
inline bool CUnit::Valid() const
{
return (unit_id != unit_id_invalid )
&& (player_id != Player::NUM_INVALID )
&& (player_id != player_t::NUM_INVALID )
&& (unit_vis != unitvis_invalid);
}