Changeset eb8adb1 in network-game for client

Timestamp:

Dec 31, 2012, 1:22:06 AM (12 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

8a3ef42

Parents:

8f438a5

Message:

Added a map from player ids to players to the client

File:

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

client/Client/main.cpp

@@ -19 +19 @@
 #include <iostream>
 
+#include <map>
+
 #include <allegro5/allegro.h>
 #include <allegro5/allegro_font.h>
@@ -40 +42 @@
 void initWinSock();
 void shutdownWinSock();
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole);
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map<unsigned int, Player>& mapPlayers);
 
 // callbacks
@@ -95 +97 @@
    bool redraw = true;
    doexit = false;
+   map<unsigned int, Player> mapPlayers;
 
    float bouncer_x = SCREEN_W / 2.0 - BOUNCER_SIZE / 2.0;
@@ -290 +293 @@
       if (receiveMessage(&msgFrom, sock, &from) >= 0)
       {
-         processMessage(msgFrom, state, chatConsole);
+         processMessage(msgFrom, state, chatConsole, mapPlayers);
          cout << "state: " << state << endl;
       }
@@ -368 +371 @@
 }
 
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole)
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map<unsigned int, Player>& mapPlayers)
 {
    string response = string(msg.buffer);
@@ -414 +417 @@
       case STATE_LOGIN:
       {
-         chatConsole.addLine(response);
-
-          switch(msg.type)
+         switch(msg.type)
          {
             case MSG_TYPE_REGISTER:
@@ -424 +425 @@
             case MSG_TYPE_LOGIN:
             {
+               chatConsole.addLine(response);
+
                if (response.compare("You have successfully logged out.") == 0)
                {
@@ -442 +445 @@
                p.deserialize(msg.buffer);
 
+               cout << "p.id: " << p.id << endl;
                cout << "p.name: " << p.name << endl;
                cout << "p.pos.x: " << p.pos.x << endl;
                cout << "p.pos.y: " << p.pos.y << endl;
 
+               mapPlayers[p.id] = p;
+
                break;
             }
-         }
-                     
+            case MSG_TYPE_CHAT:
+            {
+               chatConsole.addLine(response);
+
+               break;
+            }
+         }
+
          break;
       }