Using enum class for player types instead of MACRO.

This might eliminate some future problems.

Author: Crayon2000

source/game.cpp

@@ -217,7 +217,7 @@ void Game::Paint()
         case GAME_SCREEN:
             GameScreen(true);
             // AI
-            if(RoundFinished == false && WTTPlayer[CurrentPlayer].GetType() == PLAYER_CPU)
+            if(RoundFinished == false && WTTPlayer[CurrentPlayer].GetType() == playerType::CPU)
             {   // AI
                 if(AIThinkLoop > (rand() % 10 + 20))
                 {
@@ -592,17 +592,17 @@ bool Game::ControllerManager()
                     switch(SelectedButton)
                     {
                         case 0:
-                            WTTPlayer[1].SetType(PLAYER_HUMAN);
+                            WTTPlayer[1].SetType(playerType::Human);
                             GameMode = gameMode::VsHuman1;
                             ChangeScreen(GAME_SCREEN);
                             break;
                         case 1:
-                            WTTPlayer[1].SetType(PLAYER_CPU);
+                            WTTPlayer[1].SetType(playerType::CPU);
                             GameMode = gameMode::VsAI;
                             ChangeScreen(GAME_SCREEN);
                             break;
                         case 2:
-                            WTTPlayer[1].SetType(PLAYER_HUMAN);
+                            WTTPlayer[1].SetType(playerType::Human);
                             GameMode = gameMode::VsHuman2;
                             ChangeScreen(GAME_SCREEN);
                             break;
@@ -827,10 +827,9 @@ void Game::PrintWrapText(u16 x, u16 y, u16 maxLineWidth,
     u32 ShadowColor, s8 OffsetX, s8 OffsetY)
 {
     std::string tmp = input + " "; // Make local copy
-    std::string tmp2;
-    std::string::iterator startIndex = tmp.begin(),
-                           lastSpace = tmp.begin(),
-                           i = tmp.begin();
+    std::string::iterator startIndex = tmp.begin();
+    std::string::iterator lastSpace = tmp.begin();
+    std::string::iterator i = tmp.begin();
     int ypos = y;
     int z = 0;
     int textLeft;
@@ -840,6 +839,7 @@ void Game::PrintWrapText(u16 x, u16 y, u16 maxLineWidth,
     {
         if(*i == L' ')
         {
+            std::string tmp2;
             z = GRRLIB_WidthTTF(DefaultFont, tmp2.assign(startIndex, i).c_str(), fontSize);
 
             if(z >= maxLineWidth)

source/player.cpp

@@ -5,7 +5,7 @@
  */
 Player::Player() :
     Score(0),
-    Type(PLAYER_HUMAN)
+    Type(playerType::Human)
 {
 }
 
@@ -74,7 +74,7 @@ void Player::ResetScore()
  * Set the player type.
  * @param[in] AType Give the type of player.
  */
-void Player::SetType(u8 AType)
+void Player::SetType(playerType AType)
 {
     Type = AType;
 }
@@ -83,7 +83,7 @@ void Player::SetType(u8 AType)
  * Get the player type.
  * @return Player type.
  */
-u8 Player::GetType()
+playerType Player::GetType()
 {
     return Type;
 }

source/player.h

@@ -10,8 +10,13 @@
 #include <gctypes.h>
 #include <string>
 
-#define PLAYER_HUMAN    0 /**< Identify a human player. */
-#define PLAYER_CPU      1 /**< Identify a computer player. */
+/**
+ * Types of player.
+ */
+enum class playerType : u8 {
+    Human, /**< Identify a human player. */
+    CPU    /**< Identify a computer player. */
+};
 
 /**
  * This class is used managed players.
@@ -29,13 +34,13 @@ class Player
     unsigned int GetScore();
     void IncScore();
     void ResetScore();
-    void SetType(u8);
-    u8 GetType();
+    void SetType(playerType);
+    playerType GetType();
 private:
     unsigned int Score;
     std::string Name;
     u8 Sign;
-    u8 Type;
+    playerType Type;
 };
 //---------------------------------------------------------------------------
 #endif