Changeset 4509648 in network-game for server/server.cpp

Timestamp:

Dec 18, 2013, 12:57:06 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

70fc3e8

Parents:

2d78e03

Message:

The server replies with the correct message type to a LOGOUT message

File:

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

server/server.cpp

@@ -611 +611 @@
          Player::PlayerClass playerClass;
 
+         serverMsg.type = MSG_TYPE_REGISTER;
          memcpy(&playerClass, clientMsg.buffer+username.length()+password.length()+2, 4);
-         serverMsg.type = MSG_TYPE_REGISTER;
 
          cout << "username: " << username << endl;
@@ -727 +727 @@
          Player *p = findPlayerByName(mapPlayers, name);
 
-         memcpy(serverMsg.buffer, &p->id, 4);
-
          if (p == NULL)
          {
@@ -755 +753 @@
 
             // broadcast to all players before deleting p from the map
+            serverMsg.type = MSG_TYPE_LOGOUT;
+            memcpy(serverMsg.buffer, &p->id, 4);
+
             map<unsigned int, Player*>::iterator it;
             for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
@@ -1065 +1066 @@
          g->removePlayer(p->id);
 
-         // broadcast a messsage to other players so they know someone left the game
-         // also, check if the game has any players left. If not, remove it and send everyone a message so the game is gone from their lobby list
-
          int numPlayers = g->getNumPlayers();
-         cout << "" << endl;
 
          serverMsg.type = MSG_TYPE_GAME_INFO;