Changeset 3476207 in network-game

Timestamp:

Jul 4, 2014, 8:23:38 PM (10 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

dfc81f0, f15d6a9

Parents:

e98426d

Message:

Client shows all players in the game lobby and sends messages to the server when the client player switches teams

File:

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

client/Client/main.cpp

@@ -439 +439 @@
             int drawPosition = 0;
 
-            switch (currentPlayer->team) {
-            case -1:
-               drawPosition = 200;
-               break;
-            case 0:
-               drawPosition = 400;
-               break;
-            case 1:
-               drawPosition = 600;
-               break;
-            }
-
             map<unsigned int, Player*> gamePlayers = game->getPlayers();
             map<unsigned int, Player*>::iterator itPlayers;
@@ -456 +444 @@
             int i=0;
             for (itPlayers = gamePlayers.begin(); itPlayers != gamePlayers.end(); itPlayers++) {
+               switch (itPlayers->second->team) {
+               case -1:
+                  drawPosition = 200;
+                  break;
+               case 0:
+                  drawPosition = 400;
+                  break;
+               case 1:
+                  drawPosition = 600;
+                  break;
+               }
+
                oss << itPlayers->second->name << endl;
                al_draw_text(font, al_map_rgb(0, 255, 0), drawPosition, 135+i*15, ALLEGRO_ALIGN_LEFT, oss.str().c_str());
@@ -845 +845 @@
                state = STATE_GAME_LOBBY;
                wndCurrent = wndGameLobby;
-               mapPlayers[curPlayerId]->team = -1;
 
                msgTo.type = MSG_TYPE_JOIN_GAME_ACK;
@@ -954 +953 @@
                p.deserialize(msg.buffer);
                cout << "Deserialized player" << endl;
+               cout << "player team: " << p.team << endl;
+               cout << "current player team: " << currentPlayer->team << endl;
                p.timeLastUpdated = getCurrentMillis();
                p.isChasing = false;
@@ -966 +967 @@
                   mapPlayers[p.getId()] = new Player(p);
 
-               game->addPlayer(mapPlayers[p.getId()]);
+               game->addPlayer(mapPlayers[p.getId()], false);
 
                break;
@@ -1369 +1370 @@
    cout << "joining waiting area" << endl;
    currentPlayer->team = -1;
+
+   msgTo.type = MSG_TYPE_JOIN_TEAM;
+   memcpy(msgTo.buffer, &(currentPlayer->team), 4);
+
+   msgProcessor.sendMessage(&msgTo, &server);
 }
 
@@ -1374 +1380 @@
    cout << "joining blue team" << endl;
    currentPlayer->team = 0;
+
+   msgTo.type = MSG_TYPE_JOIN_TEAM;
+   memcpy(msgTo.buffer, &(currentPlayer->team), 4);
+
+   msgProcessor.sendMessage(&msgTo, &server);
 }
 
@@ -1379 +1390 @@
    cout << "joining red team" << endl;
    currentPlayer->team = 1;
+
+   msgTo.type = MSG_TYPE_JOIN_TEAM;
+   memcpy(msgTo.buffer, &(currentPlayer->team), 4);
+
+   msgProcessor.sendMessage(&msgTo, &server);
 }