Changeset f203c5c in network-game

Timestamp:

Sep 26, 2013, 11:08:57 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

803566d

Parents:

f41a7f9

Message:

Minor server code cleanup and debugging

File:

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

server/server.cpp

@@ -621 +621 @@
          cout << "Got login message" << endl;
 
-         serverMsg.type = MSG_TYPE_LOGIN;
-         
          string username(clientMsg.buffer);
          string password(strchr(clientMsg.buffer, '\0')+1);
@@ -638 +636 @@
          else
          {
-            serverMsg.type = MSG_TYPE_PLAYER;
-
             updateUnusedPlayerId(unusedPlayerId, mapPlayers);
             p->id = unusedPlayerId;
@@ -647 +643 @@
             // choose a random team (either 0 or 1)
             p->team = rand() % 2;
+
+            serverMsg.type = MSG_TYPE_PLAYER;
 
             // tell the new player about all the existing players
@@ -693 +691 @@
             }
 
-            serverMsg.type = MSG_TYPE_LOGIN;
             mapPlayers[unusedPlayerId] = *p;
          }
 
+         serverMsg.type = MSG_TYPE_LOGIN;
          delete(p);
 
@@ -955 +953 @@
          // tell the new player about all the existing players
          cout << "Sending other players to new player" << endl;
+         serverMsg.type = MSG_TYPE_LOGIN;
 
          map<unsigned int, Player*>::iterator it;
@@ -1033 +1032 @@
          // tell the new player about all the existing players
          cout << "Sending other players to new player" << endl;
+         serverMsg.type = MSG_TYPE_LOGIN;
 
          map<unsigned int, Player*>::iterator it;