Changeset 50e6c7a in network-game

Timestamp:

Sep 26, 2013, 1:51:26 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

99afbb8

Parents:

b8f789d

Message:

The client stores and displays a list of existing games

File:

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

client/Client/main.cpp

@@ -118 +118 @@
 chat chatConsole, debugConsole;
 bool debugging;
+vector<string> games;
 
 MessageProcessor msgProcessor;
@@ -421 +422 @@
                      // right now, this code will target all players other than the current one
                      target = &it->second;
-                     if (target->id != curPlayerId && target->team != curPlayer->team) {
+                     if (target->id != curPlayerId && target->team != curPlayer->team)
+                     {
                         msgTo.type = MSG_TYPE_START_ATTACK;
                         memcpy(msgTo.buffer, &curPlayerId, 4);
@@ -448 +450 @@
             wndCurrent->draw(display);
 
-         if(wndCurrent == wndGame) {
+         if (wndCurrent == wndLobby) {
+            for (int i=0; i<games.size(); i++) {
+               al_draw_text(font, al_map_rgb(0, 255, 0), SCREEN_W*1/4-100, 120+i*15, ALLEGRO_ALIGN_LEFT, games[i].c_str());
+            }
+         }
+         else if (wndCurrent == wndGame)
+         {
             if (!debugging)
                chatConsole.draw(font, al_map_rgb(255,255,255));
@@ -779 +787 @@
                cout << "Received a PROJECTILE message" << endl;
 
-               int id, x, y, targetId;
+               unsigned int id, x, y, targetId;
 
                memcpy(&id, msg.buffer, 4);
@@ -803 +811 @@
 
                int id;
-
                memcpy(&id, msg.buffer, 4);
                
@@ -810 +817 @@
                break;
             }
+            case MSG_TYPE_GAME_INFO:
+            {
+                cout << "Received a GAME_INFO message" << endl;
+
+               string name(msg.buffer+4);
+               int numPlayers;
+
+               memcpy(&numPlayers, msg.buffer, 4);
+               
+               cout << "Received game info for " << name << " (num players: " << numPlayers << ")" << endl;
+               games.push_back(name);
+
+               break;
+            }
             default:
             {
                cout << "(STATE_LOBBY) Received invlaid message of type " << msg.type << endl;
+
                break;
             }