Changes in / [e2a0a27:13a8212] in network-game

File:

• client/Client/main.cpp (modified) (6 diffs)

client/Client/main.cpp

@@ -831 +831 @@
    cout << "Total players in map: " << mapPlayers.size() << endl;
 
+   // this is outdated since most messages now don't contain just a text string
+   string response = string(msg.buffer);
+
    switch(state)
    {
@@ -841 +844 @@
             case MSG_TYPE_REGISTER:
             {
-               lblRegisterStatus->setText(msg.buffer);
+               lblRegisterStatus->setText(response);
                break;
             }
@@ -860 +863 @@
             case MSG_TYPE_LOGIN:
             {
-               if (string(msg.buffer).compare("Player has already logged in.") == 0)
+               if (response.compare("Player has already logged in.") == 0)
                {
                   goToLoginScreen();
                   state = STATE_START;
 
-                  lblLoginStatus->setText(msg.buffer);
+                  lblLoginStatus->setText(response);
                }
-               else if (string(msg.buffer).compare("Incorrect username or password") == 0)
+               else if (response.compare("Incorrect username or password") == 0)
                {
                   goToLoginScreen();
                   state = STATE_START;
 
-                  lblLoginStatus->setText(msg.buffer);
+                  lblLoginStatus->setText(response);
                }
                else
@@ -905 +908 @@
                // Check if it's about you or another player
                memcpy(&playerId, msg.buffer, 4);
-               string response = string(msg.buffer+4);
+               response = string(msg.buffer+4);
 
                if (playerId == curPlayerId)
@@ -930 +933 @@
             case MSG_TYPE_CHAT:
             {
-               chatConsole.addLine(msg.buffer);
+               chatConsole.addLine(response);
 
                break;
@@ -1109 +1112 @@
                // Check if it's about you or another player
                memcpy(&playerId, msg.buffer, 4);
+               response = string(msg.buffer+4);
 
                if (playerId == curPlayerId)