Changed owner of message to print in Client

Author: gabrieldiem

client_src/game_protocol_client.cpp

@@ -12,8 +12,6 @@ static Logger& logger = Logger::get_instance();
 GameProtocolClient::GameProtocolClient(const std::string& hostname, const std::string& servname):
         hostname(hostname),
         servname(servname),
-        ENEMY_DIED_EVENT_MESSAGE("Un enemigo ha muerto."),
-        ENEMY_REVIVED_EVENT_MESSAGE("Un enemigo ha revivido."),
         skt(hostname.c_str(), servname.c_str()),
         is_skt_closed(false) {}
 
@@ -70,12 +68,13 @@ const uint8_t GameProtocolClient::receive_enemy_event() {
 
 
 const std::string GameProtocolClient::get_enemy_event_message(
-        const uint8_t& enemy_event_code) const {
+        const uint8_t& enemy_event_code, const std::string& ENEMY_DIED_EVENT_MESSAGE,
+        const std::string& ENEMY_REVIVED_EVENT_MESSAGE) const {
     if (enemy_event_code == this->game_commands.get_enemy_died_code()) {
-        return this->ENEMY_DIED_EVENT_MESSAGE;
+        return ENEMY_DIED_EVENT_MESSAGE;
 
     } else if (enemy_event_code == this->game_commands.get_enemy_revived_code()) {
-        return this->ENEMY_REVIVED_EVENT_MESSAGE;
+        return ENEMY_REVIVED_EVENT_MESSAGE;
 
     } else {
         logger.client_error("Closed socket from server.");
@@ -84,24 +83,30 @@ const std::string GameProtocolClient::get_enemy_event_message(
 }
 
 
-const GameMessage GameProtocolClient::receive_message_from_server() {
+const GameMessage GameProtocolClient::receive_message_from_server(
+        const std::string& ENEMY_DIED_EVENT_MESSAGE,
+        const std::string& ENEMY_REVIVED_EVENT_MESSAGE) {
     this->receive_server_start_broadcast();
     const uint16_t enemies_alive = this->receive_enemies_alive();
     const uint16_t enemies_dead = this->receive_enemies_dead();
     const uint8_t enemy_event_code = this->receive_enemy_event();
 
-    std::string event_message = this->get_enemy_event_message(enemy_event_code);
+    std::string event_message = this->get_enemy_event_message(
+            enemy_event_code, ENEMY_DIED_EVENT_MESSAGE, ENEMY_REVIVED_EVENT_MESSAGE);
 
     return GameMessage(enemies_alive, enemies_dead, event_message);
 }
 
 
 const std::vector<GameMessage> GameProtocolClient::receive_messages_from_server(
-        const uint32_t& number_of_messages) {
+        const uint32_t& number_of_messages, const std::string& ENEMY_DIED_EVENT_MESSAGE,
+        const std::string& ENEMY_REVIVED_EVENT_MESSAGE) {
+
     std::vector<GameMessage> messages;
 
     for (uint32_t i = 0; i < number_of_messages; i++) {
-        GameMessage message = this->receive_message_from_server();
+        GameMessage message = this->receive_message_from_server(ENEMY_DIED_EVENT_MESSAGE,
+                                                                ENEMY_REVIVED_EVENT_MESSAGE);
         messages.push_back(message);
     }
 

client_src/game_protocol_client.h

@@ -15,10 +15,6 @@ class GameProtocolClient {
     const std::string hostname;
     // cppcheck-suppress unusedStructMember
     const std::string servname;
-    // cppcheck-suppress unusedStructMember
-    const std::string ENEMY_DIED_EVENT_MESSAGE;
-    // cppcheck-suppress unusedStructMember
-    const std::string ENEMY_REVIVED_EVENT_MESSAGE;
     Socket skt;
     // cppcheck-suppress unusedStructMember
     bool is_skt_closed;
@@ -27,7 +23,8 @@ class GameProtocolClient {
     /*
      *  Receives all the information from the server to build a valid GameMessage
      */
-    const GameMessage receive_message_from_server();
+    const GameMessage receive_message_from_server(const std::string& ENEMY_DIED_EVENT_MESSAGE,
+                                                  const std::string& ENEMY_REVIVED_EVENT_MESSAGE);
 
 
     /*
@@ -50,7 +47,9 @@ class GameProtocolClient {
      */
     const uint8_t receive_enemy_event();
 
-    const std::string get_enemy_event_message(const uint8_t& enemy_event_code) const;
+    const std::string get_enemy_event_message(const uint8_t& enemy_event_code,
+                                              const std::string& ENEMY_DIED_EVENT_MESSAGE,
+                                              const std::string& ENEMY_REVIVED_EVENT_MESSAGE) const;
 
 public:
     /*
@@ -81,7 +80,9 @@ class GameProtocolClient {
      *  Calls GameProtocolClient::receive_message_from_server a number of times represented by the
      *  parameter number_of_messages and returns a vector will all the messages built
      */
-    const std::vector<GameMessage> receive_messages_from_server(const uint32_t& number_of_messages);
+    const std::vector<GameMessage> receive_messages_from_server(
+            const uint32_t& number_of_messages, const std::string& ENEMY_DIED_EVENT_MESSAGE,
+            const std::string& ENEMY_REVIVED_EVENT_MESSAGE);
 
     /*
      *   Return true if the socket connection with the ser is still open or false if it's closed

client_src/jazz_jackrabbit_2_game_client.cpp

@@ -19,6 +19,8 @@ static Logger& logger = Logger::get_instance();
 static const char USER_OPTION_ATTACK[] = "ATACAR";
 static const char USER_OPTION_RECEIVE_MSG_FROM_SERVER[] = "LEER";
 static const char USER_OPTION_QUIT[] = "SALIR";
+static const char ENEMY_DIED_EVENT_MESSAGE[] = "Un enemigo ha muerto.";
+static const char ENEMY_REVIVED_EVENT_MESSAGE[] = "Un enemigo ha revivido.";
 
 JazzJackrabbit2GameClient::JazzJackrabbit2GameClient(const std::string& hostname,
                                                      const std::string& service):
@@ -125,8 +127,8 @@ void JazzJackrabbit2GameClient::execute_read_from_server(
 
     const uint32_t number_of_messages = std::atoi(user_input_vectorized[1].c_str());
     logger.client_info("Reading from server: " + std::to_string(number_of_messages) + " messages.");
-    std::vector<GameMessage> messages =
-            this->protocol_client.receive_messages_from_server(number_of_messages);
+    std::vector<GameMessage> messages = this->protocol_client.receive_messages_from_server(
+            number_of_messages, ENEMY_DIED_EVENT_MESSAGE, ENEMY_REVIVED_EVENT_MESSAGE);
     this->print_messages_from_server(messages);
 }