Changeset b8601ee in network-game for server

Timestamp:

May 25, 2013, 11:51:29 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

15efb4e

Parents:

5c84d54

Message:

The server keeps track of each team's score and sends SCORE meesages to the clients upon login and when the score changes

File:

• server/server.cpp (modified) (8 diffs)

server/server.cpp

@@ -38 +38 @@
 // from used to be const. Removed that so I could take a reference
 // and use it to send messages
-bool processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG &serverMsg, int sock);
+bool processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG &serverMsg, int sock, int &scoreBlue, int &scoreRed);
 
 void updateUnusedId(unsigned int& id, map<unsigned int, Player>& mapPlayers);
@@ -84 +84 @@
    map<unsigned int, Player> mapPlayers;
    unsigned int unusedId = 1;
+   int scoreBlue, scoreRed;
+
+   scoreBlue = 0;
+   scoreRed = 0;
 
    //SSL_load_error_strings();
@@ -176 +180 @@
                         pos = gameMap->getStructureLocation(WorldMap::STRUCTURE_RED_FLAG);
                         flagTurnedIn = true;
+                        scoreBlue++;
                      }
 
@@ -188 +193 @@
                         pos = gameMap->getStructureLocation(WorldMap::STRUCTURE_BLUE_FLAG);
                         flagTurnedIn = true;
+                        scoreRed++;
                      }
 
@@ -204 +210 @@
 
                   map<unsigned int, Player>::iterator it2;
+                  for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++)
+                  {
+                     if ( sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 )
+                        error("sendMessage");
+                  }
+
+                  serverMsg.type = MSG_TYPE_SCORE;
+                  memcpy(serverMsg.buffer, &scoreBlue, 4);
+                  memcpy(serverMsg.buffer+4, &scoreRed, 4);
+
                   for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++)
                   {
@@ -233 +249 @@
 
       if (n >= 0) {
-         broadcastResponse = processMessage(clientMsg, from, mapPlayers, gameMap, unusedId, serverMsg, sock);
+         broadcastResponse = processMessage(clientMsg, from, mapPlayers, gameMap, unusedId, serverMsg, sock, scoreBlue, scoreRed);
 
          // probably replace this with a function that prints based on the
@@ -263 +279 @@
 }
 
-bool processMessage(const NETWORK_MSG& clientMsg, struct sockaddr_in& from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG& serverMsg, int sock)
+bool processMessage(const NETWORK_MSG& clientMsg, struct sockaddr_in& from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG& serverMsg, int sock, int &scoreBlue, int &scoreRed)
 {
    DataAccess da;
@@ -355 +371 @@
             }
 
+            // send the current score
+            serverMsg.type = MSG_TYPE_SCORE;
+            memcpy(serverMsg.buffer, &scoreBlue, 4);
+            memcpy(serverMsg.buffer+4, &scoreRed, 4);
+            if ( sendMessage(&serverMsg, sock, &from) < 0 )
+               error("sendMessage");
+
+            serverMsg.type = MSG_TYPE_PLAYER;
             p->serialize(serverMsg.buffer);
             cout << "Should be broadcasting the message" << endl;