Changes in / [cdb4bec:e607c0f] in network-game

File:

• server/server.cpp (modified) (8 diffs)

server/server.cpp

@@ -94 +94 @@
    set_nonblock(sock);
 
-   bool broadcastResponse;
+   bool broadcastMessage;
    while (true) {
 
@@ -104 +104 @@
          cout << "Got a message" << endl;
 
-         broadcastResponse = processMessage(clientMsg, from, vctPlayers, serverMsg);
+         broadcastMessage = processMessage(clientMsg, from, vctPlayers, serverMsg);
 
          cout << "msg: " << serverMsg.buffer << endl;
 
-         if (broadcastResponse)
-         {
-            cout << "Should be broadcasting the message" << endl;
-
+         if (broadcastMessage)
+         {
             vector<Player>::iterator it;
 
@@ -122 +120 @@
          else
          {
-            cout << "Should be sending back the message" << endl;
-
             if ( sendMessage(&serverMsg, sock, &from) < 0 )
                error("sendMessage");
@@ -143 +139 @@
    cout << "MSG contents: " << clientMsg.buffer << endl;
 
-   // maybe we should make a message class and have this be a member
    bool broadcastResponse = false;
 
@@ -191 +186 @@
 
             vctPlayers.push_back(newP);
-            strcpy(serverMsg.buffer, "Login successful. Enjoy chatting with other players.");
+            strcpy(serverMsg.buffer, "Login successful. Enjoy chatting with outher players.");
          }
 
@@ -226 +221 @@
       case MSG_TYPE_CHAT:
       {
-         cout << "Got a chat message" << endl;
-
          Player *p = findPlayerByAddr(vctPlayers, from);
 
@@ -239 +232 @@
 
             stringstream ss;
-            ss << p->name << ": " << clientMsg.buffer;
+            ss << p->name << ": " << clientMsg.buffer << endl;
 
             strcpy(serverMsg.buffer, ss.str().c_str());
@@ -256 +249 @@
          break;
       }
-   }
-
-   return broadcastResponse;
-}
-
+
+      return broadcastResponse;
+   }
+}