From 4aa51a64b664f8066d93d15c9b9aa219321e5942 Mon Sep 17 00:00:00 2001 From: mdiluzio Date: Sun, 21 Dec 2014 10:45:08 +0000 Subject: [PATCH] Correct case for unitvis --- source/game/gametypes.h | 4 ++-- source/game/unit.cpp | 14 +++++++------- source/game/unit.h | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/source/game/gametypes.h b/source/game/gametypes.h index 43cc4d3..12ed9b0 100644 --- a/source/game/gametypes.h +++ b/source/game/gametypes.h @@ -15,9 +15,9 @@ enum class Team : char 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::max(); -static const unitVis_c unitVis_invalid = std::numeric_limits::max(); +static const unitvis_c unitvis_invalid = std::numeric_limits::max(); #endif //_GAME_TYPES_H_ \ No newline at end of file diff --git a/source/game/unit.cpp b/source/game/unit.cpp index 6121d9c..0f7c8c0 100644 --- a/source/game/unit.cpp +++ b/source/game/unit.cpp @@ -18,7 +18,7 @@ namespace } // 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 const dir_to_vis_map& get_vis_map_V() @@ -43,7 +43,7 @@ void __forceResetCUnitID() } // Get a unit from a visual -CUnit CUnit::GetUnitFromVis( unitVis_c vis ) +CUnit CUnit::GetUnitFromVis( unitvis_c vis ) { CUnit unit; unit.SetFromVisual(vis); @@ -91,7 +91,7 @@ CUnit CUnit::GetUnitFromString(const std::string& unit ) ret.unit_id = (unit_id_t)id; ret.team_id = (Team)team; - ret.unit_vis = (unitVis_c)vis; + ret.unit_vis = (unitvis_c)vis; ret.dir = (dir_t)dir; ret.pos = uvector2(posx,posy); @@ -102,7 +102,7 @@ CUnit CUnit::GetUnitFromString(const std::string& unit ) CUnit::CUnit() : unit_id ( get_unique_unit_id() ) , team_id ( Team::NUM_INVALID ) -, unit_vis ( unitVis_invalid ) +, unit_vis (unitvis_invalid) , dir ( dir_t::S ) , pos ( { ucoord_invalid, ucoord_invalid } ) { @@ -143,10 +143,10 @@ bool CUnit::operator==(const CUnit& rhs) } // Update the visual representation of the unit -unitVis_c CUnit::UpdateMyVisual() +unitvis_c CUnit::UpdateMyVisual() { // Start at invalid - SetVisual(unitVis_invalid); + SetVisual(unitvis_invalid); 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 -bool CUnit::SetFromVisual(const unitVis_c &vis) +bool CUnit::SetFromVisual(const unitvis_c &vis) { dir_to_vis_map::const_iterator it; diff --git a/source/game/unit.h b/source/game/unit.h index 87f1354..c53ae0b 100644 --- a/source/game/unit.h +++ b/source/game/unit.h @@ -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_