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

4
source/game/gametypes.h
View file

@ -15,9 +15,9 @@ enum class Team : char
typedef unsigned short unit_id_t; // Type for unit IDs typedef unsigned short unit_id_t; // Type for unit IDs
typedef char unitVis_c; // Typedef for unit visual representations typedef char unitvis_c; // Typedef for unit visual representations
static const unit_id_t unit_id_invalid = std::numeric_limits<unit_id_t>::max(); static const unit_id_t unit_id_invalid = std::numeric_limits<unit_id_t>::max();
static const unitVis_c unitVis_invalid = std::numeric_limits<unitVis_c>::max(); static const unitvis_c unitvis_invalid = std::numeric_limits<unitvis_c>::max();
#endif //_GAME_TYPES_H_ #endif //_GAME_TYPES_H_

14
source/game/unit.cpp
View file

@ -18,7 +18,7 @@ namespace
} }
// Map of visual representation of unit V // Map of visual representation of unit V
typedef std::map< dir_t, unitVis_c > dir_to_vis_map; typedef std::map< dir_t, unitvis_c> dir_to_vis_map;
// Helper function to get the vis map during static init // Helper function to get the vis map during static init
const dir_to_vis_map& get_vis_map_V() const dir_to_vis_map& get_vis_map_V()
@ -43,7 +43,7 @@ void __forceResetCUnitID()
} }
// Get a unit from a visual // Get a unit from a visual
CUnit CUnit::GetUnitFromVis( unitVis_c vis ) CUnit CUnit::GetUnitFromVis( unitvis_c vis )
{ {
CUnit unit; CUnit unit;
unit.SetFromVisual(vis); unit.SetFromVisual(vis);
@ -91,7 +91,7 @@ CUnit CUnit::GetUnitFromString(const std::string& unit )
ret.unit_id = (unit_id_t)id; ret.unit_id = (unit_id_t)id;
ret.team_id = (Team)team; ret.team_id = (Team)team;
ret.unit_vis = (unitVis_c)vis; ret.unit_vis = (unitvis_c)vis;
ret.dir = (dir_t)dir; ret.dir = (dir_t)dir;
ret.pos = uvector2(posx,posy); ret.pos = uvector2(posx,posy);
@ -102,7 +102,7 @@ CUnit CUnit::GetUnitFromString(const std::string& unit )
CUnit::CUnit() CUnit::CUnit()
: unit_id ( get_unique_unit_id() ) : unit_id ( get_unique_unit_id() )
, team_id ( Team::NUM_INVALID ) , team_id ( Team::NUM_INVALID )
, unit_vis ( unitVis_invalid ) , unit_vis (unitvis_invalid)
, dir ( dir_t::S ) , dir ( dir_t::S )
, pos ( { ucoord_invalid, ucoord_invalid } ) , pos ( { ucoord_invalid, ucoord_invalid } )
{ {
@ -143,10 +143,10 @@ bool CUnit::operator==(const CUnit& rhs)
} }
// Update the visual representation of the unit // Update the visual representation of the unit
unitVis_c CUnit::UpdateMyVisual() unitvis_c CUnit::UpdateMyVisual()
{ {
// Start at invalid // Start at invalid
SetVisual(unitVis_invalid); SetVisual(unitvis_invalid);
dir_to_vis_map::const_iterator it = get_vis_map_V().find(dir); dir_to_vis_map::const_iterator it = get_vis_map_V().find(dir);
@ -158,7 +158,7 @@ unitVis_c CUnit::UpdateMyVisual()
} }
// Set the unit from visual // Set the unit from visual
bool CUnit::SetFromVisual(const unitVis_c &vis) bool CUnit::SetFromVisual(const unitvis_c &vis)
{ {
dir_to_vis_map::const_iterator it; dir_to_vis_map::const_iterator it;

14
source/game/unit.h
View file

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