Changeset e2a0a27 in network-game for client/Client/main.cpp

Timestamp:

Oct 7, 2015, 11:54:16 PM (9 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

033c78b, 8ed6c8a

Parents:

13a8212 (diff), 45c9d0f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/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)
    {
@@ -844 +841 @@
             case MSG_TYPE_REGISTER:
             {
-               lblRegisterStatus->setText(response);
+               lblRegisterStatus->setText(msg.buffer);
                break;
             }
@@ -863 +860 @@
             case MSG_TYPE_LOGIN:
             {
-               if (response.compare("Player has already logged in.") == 0)
+               if (string(msg.buffer).compare("Player has already logged in.") == 0)
                {
                   goToLoginScreen();
                   state = STATE_START;
 
-                  lblLoginStatus->setText(response);
+                  lblLoginStatus->setText(msg.buffer);
                }
-               else if (response.compare("Incorrect username or password") == 0)
+               else if (string(msg.buffer).compare("Incorrect username or password") == 0)
                {
                   goToLoginScreen();
                   state = STATE_START;
 
-                  lblLoginStatus->setText(response);
+                  lblLoginStatus->setText(msg.buffer);
                }
                else
@@ -908 +905 @@
                // Check if it's about you or another player
                memcpy(&playerId, msg.buffer, 4);
-               response = string(msg.buffer+4);
+               string response = string(msg.buffer+4);
 
                if (playerId == curPlayerId)
@@ -933 +930 @@
             case MSG_TYPE_CHAT:
             {
-               chatConsole.addLine(response);
+               chatConsole.addLine(msg.buffer);
 
                break;
@@ -1112 +1109 @@
                // Check if it's about you or another player
                memcpy(&playerId, msg.buffer, 4);
-               response = string(msg.buffer+4);
 
                if (playerId == curPlayerId)