diff --git a/source/game/game.cpp b/source/game/game.cpp index 0e641aa..fca3376 100644 --- a/source/game/game.cpp +++ b/source/game/game.cpp @@ -296,26 +296,26 @@ bool CTTRTSGame::CheckForPassThrough( const CUnit& one, const CUnit& two ) { uvector2 pos1 = one.GetPos(); uvector2 pos2 = two.GetPos(); - dir_t dir1 = one.GetDir(); - dir_t dir2 = two.GetDir(); + dir_c dir1 = one.GetDir(); + dir_c dir2 = two.GetDir(); if( pos1.x == pos2.x ) { // Same col if (pos1.y == (pos2.y + 1)) { - if (dir1 == dir_t::N && dir2 == dir_t::S) + if (dir1 == dir_c::N && dir2 == dir_c::S) return true; } else if (pos1.y == (pos2.y - 1)) { - if (dir1 == dir_t::S && dir2 == dir_t::N) + if (dir1 == dir_c::S && dir2 == dir_c::N) return true; } } else if( pos1.y == pos2.y ) { // Same row if( pos1.x == (pos2.x+1) ) { - if( dir1 == dir_t::E && dir2 == dir_t::W ) + if( dir1 == dir_c::E && dir2 == dir_c::W ) return true; } else if( pos1.x == (pos2.x-1) ) { - if( dir1 == dir_t::E && dir2 == dir_t::W ) + if( dir1 == dir_c::E && dir2 == dir_c::W ) return true; } } diff --git a/source/game/unit.cpp b/source/game/unit.cpp index 72b7184..39d9b48 100644 --- a/source/game/unit.cpp +++ b/source/game/unit.cpp @@ -18,17 +18,17 @@ namespace } // Map of visual representation of unit V - typedef std::map< dir_t, unitvis_c> dir_to_vis_map; + typedef std::map dir_to_vis_map; // Helper function to get the vis map during static init const dir_to_vis_map& get_vis_map_V() { static const dir_to_vis_map sk_visMap = { - {dir_t::N,'^'}, - {dir_t::E,'>'}, - {dir_t::S,'v'}, - {dir_t::W,'<'}, + {dir_c::N,'^'}, + {dir_c::E,'>'}, + {dir_c::S,'v'}, + {dir_c::W,'<'}, }; return sk_visMap; @@ -90,7 +90,7 @@ CUnit CUnit::GetUnitFromString(const std::string& unit ) ret.unit_id = (unit_id_t)id; ret.player_id = (player_t) player; ret.unit_vis = (unitvis_c)vis; - ret.dir = (dir_t)dir; + ret.dir = (dir_c)dir; ret.pos = uvector2(posx,posy); return ret; @@ -101,7 +101,7 @@ CUnit::CUnit() : unit_id ( get_unique_unit_id() ) , player_id ( player_t::NUM_INVALID ) , unit_vis (unitvis_invalid) -, dir ( dir_t::S ) +, dir ( dir_c::S ) , pos ( { ucoord_invalid, ucoord_invalid } ) { UpdateMyVisual(); @@ -175,24 +175,24 @@ bool CUnit::SetFromVisual(const unitvis_c &vis) } // Turn unit left -dir_t CUnit::TurnLeft() +dir_c CUnit::TurnLeft() { switch( dir ) { - case dir_t::N: - dir = dir_t::W; + case dir_c::N: + dir = dir_c::W; break; - case dir_t::E: - dir = dir_t::N; + case dir_c::E: + dir = dir_c::N; break; - case dir_t::S: - dir = dir_t::E; + case dir_c::S: + dir = dir_c::E; break; - case dir_t::W: - dir = dir_t::S; + case dir_c::W: + dir = dir_c::S; break; } @@ -202,24 +202,24 @@ dir_t CUnit::TurnLeft() } // Turn unit right -dir_t CUnit::TurnRight() +dir_c CUnit::TurnRight() { switch( dir ) { - case dir_t::N: - dir = dir_t::E; + case dir_c::N: + dir = dir_c::E; break; - case dir_t::E: - dir = dir_t::S; + case dir_c::E: + dir = dir_c::S; break; - case dir_t::S: - dir = dir_t::W; + case dir_c::S: + dir = dir_c::W; break; - case dir_t::W: - dir = dir_t::N; + case dir_c::W: + dir = dir_c::N; break; } @@ -229,24 +229,24 @@ dir_t CUnit::TurnRight() } // Turn unit around -dir_t CUnit::TurnAround() +dir_c CUnit::TurnAround() { switch( dir ) { - case dir_t::N: - dir = dir_t::S; + case dir_c::N: + dir = dir_c::S; break; - case dir_t::E: - dir = dir_t::W; + case dir_c::E: + dir = dir_c::W; break; - case dir_t::S: - dir = dir_t::N; + case dir_c::S: + dir = dir_c::N; break; - case dir_t::W: - dir = dir_t::E; + case dir_c::W: + dir = dir_c::E; break; } diff --git a/source/game/unit.h b/source/game/unit.h index fdbfd1f..982f140 100644 --- a/source/game/unit.h +++ b/source/game/unit.h @@ -38,13 +38,13 @@ public: inline const unit_id_t& GetID() const { return unit_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 dir_c & GetDir() const { return dir; } inline const uvector2& GetPos() const { return pos; } // Set 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 dir_c SetDir(const dir_c &v) { return (dir = v); } inline void SetPos(const uvector2 &v) { pos = v; } // Get the co-ordinate in front of the unit @@ -57,9 +57,9 @@ public: bool SetFromVisual(const unitvis_c &vis); // Orientation methods - dir_t TurnLeft(); - dir_t TurnRight(); - dir_t TurnAround(); + dir_c TurnLeft(); + dir_c TurnRight(); + dir_c TurnAround(); private: @@ -76,7 +76,7 @@ private: player_t player_id; // Direction - dir_t dir; + dir_c dir; // Position uvector2 pos; diff --git a/source/maths/mathtypes.h b/source/maths/mathtypes.h index b7804af..d987e25 100644 --- a/source/maths/mathtypes.h +++ b/source/maths/mathtypes.h @@ -17,7 +17,7 @@ static const coord_t coord_invalid = std::numeric_limits::max(); static const ucoord_t ucoord_invalid = std::numeric_limits::max(); // Direction representation -enum class dir_t : char +enum class dir_c : char { N = 'N', S = 'S', diff --git a/source/maths/vector2.h b/source/maths/vector2.h index ee36d5d..40ce5ad 100644 --- a/source/maths/vector2.h +++ b/source/maths/vector2.h @@ -60,20 +60,20 @@ struct uvector2 inline vector2::operator uvector2() const { return { (ucoord_t)x, (ucoord_t)y }; } -inline vector2 vecFromDir( dir_t dir ) +inline vector2 vecFromDir( dir_c dir ) { switch( dir ) { - case dir_t::N: + case dir_c::N: return { 0,1 }; - case dir_t::E: + case dir_c::E: return { 1,0 }; - case dir_t::S: + case dir_c::S: return { 0,-1 }; - case dir_t::W: + case dir_c::W: return { -1,0 }; default: diff --git a/source/test/test.cpp b/source/test/test.cpp index 00e5328..b4d197c 100644 --- a/source/test/test.cpp +++ b/source/test/test.cpp @@ -166,7 +166,7 @@ const char* tests() if ( game.GetNumUnits() != 1 ) return "Game failed to kill a unit when it logically should have"; - if (game.GetUnitByIndex(0).GetDir() != dir_t::E ) + if (game.GetUnitByIndex(0).GetDir() != dir_c::E ) return "Game killed the wrong unit"; if (game.GetUnitByIndex(0).GetID() != id )