Removed constant variables from GameCommands and replace them with static constants

Author: gabrieldiem

common_src/game_commands.cpp

@@ -2,34 +2,35 @@
 
 #include <algorithm>
 
+static const char CLIENT_ATTACK_CMD_NAME[] = "CLIENT_ATTACK";
+static const char SERVER_START_BROADCAST_CMD_NAME[] = "SERVER_START_BROADCAST";
+static const char ENEMY_DIED_CMD_NAME[] = "ENEMY_DIED";
+static const char ENEMY_REVIVED_CMD_NAME[] = "ENEMY_REVIVED";
+
 GameCommands::GameCommands():
-        CLIENT_ATTACK_CMD_NAME("CLIENT_ATTACK"),
-        SERVER_START_BROADCAST_CMD_NAME("SERVER_START_BROADCAST"),
-        ENEMY_DIED_CMD_NAME("ENEMY_DIED"),
-        ENEMY_REVIVED_CMD_NAME("ENEMY_REVIVED"),
-        game_commands_map({{this->CLIENT_ATTACK_CMD_NAME, 0x03},
-                           {this->SERVER_START_BROADCAST_CMD_NAME, 0x06},
-                           {this->ENEMY_DIED_CMD_NAME, 0x04},
-                           {this->ENEMY_REVIVED_CMD_NAME, 0x05}}) {}
+        game_commands_map({{CLIENT_ATTACK_CMD_NAME, 0x03},
+                           {SERVER_START_BROADCAST_CMD_NAME, 0x06},
+                           {ENEMY_DIED_CMD_NAME, 0x04},
+                           {ENEMY_REVIVED_CMD_NAME, 0x05}}) {}
 
 
 const uint8_t GameCommands::get_client_attack_code() const {
-    return this->game_commands_map.at(this->CLIENT_ATTACK_CMD_NAME);
+    return this->game_commands_map.at(CLIENT_ATTACK_CMD_NAME);
 }
 
 
 const uint8_t GameCommands::get_server_start_broadcast_code() const {
-    return this->game_commands_map.at(this->SERVER_START_BROADCAST_CMD_NAME);
+    return this->game_commands_map.at(SERVER_START_BROADCAST_CMD_NAME);
 }
 
 
 const uint8_t GameCommands::get_enemy_died_code() const {
-    return this->game_commands_map.at(this->ENEMY_DIED_CMD_NAME);
+    return this->game_commands_map.at(ENEMY_DIED_CMD_NAME);
 }
 
 
 const uint8_t GameCommands::get_enemy_revived_code() const {
-    return this->game_commands_map.at(this->ENEMY_REVIVED_CMD_NAME);
+    return this->game_commands_map.at(ENEMY_REVIVED_CMD_NAME);
 }
 
 

common_src/game_commands.h

@@ -7,14 +7,6 @@
 
 class GameCommands {
 private:
-    // cppcheck-suppress unusedStructMember
-    const std::string CLIENT_ATTACK_CMD_NAME;
-    // cppcheck-suppress unusedStructMember
-    const std::string SERVER_START_BROADCAST_CMD_NAME;
-    // cppcheck-suppress unusedStructMember
-    const std::string ENEMY_DIED_CMD_NAME;
-    // cppcheck-suppress unusedStructMember
-    const std::string ENEMY_REVIVED_CMD_NAME;
     // cppcheck-suppress unusedStructMember
     const std::unordered_map<std::string, uint8_t> game_commands_map;