Changeset a9a1295 in network-game for server/server.cpp

Timestamp:

Nov 10, 2014, 3:15:39 AM (10 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

c941e07

Parents:

ace001a (diff), 426fb84 (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:

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

server/server.cpp

@@ -200 +200 @@
                   map<unsigned int, Player*>::iterator it;
 
+                  time_t timeFinished = time(NULL);
                   for (it = game->getPlayers().begin(); it != game->getPlayers().end(); it++) {
                       Player* p = it->second;
@@ -211 +212 @@
                           p->losses++;
                       da.updatePlayer(p);
-                      da.saveGameHistory(p->getId(), winningTeam, game->getBlueScore(), game->getRedScore());
+                      da.saveGameHistory(p->getId(), winningTeam, game->getBlueScore(), game->getRedScore(), timeFinished);
                   }
                }
@@ -613 +614 @@
          memcpy(serverMsg.buffer+12, &numGames, 4);
          for (unsigned int i=0; i<numGames; i++) {
-            memcpy(serverMsg.buffer+16+i*16, &gameHistory[i][0], 4);
-            memcpy(serverMsg.buffer+20+i*16, &gameHistory[i][1], 4);
-            memcpy(serverMsg.buffer+24+i*16, &gameHistory[i][2], 4);
-            memcpy(serverMsg.buffer+28+i*16, &gameHistory[i][3], 4);
+            memcpy(serverMsg.buffer+16+i*20, &gameHistory[i][0], 4);
+            memcpy(serverMsg.buffer+20+i*20, &gameHistory[i][1], 4);
+            memcpy(serverMsg.buffer+24+i*20, &gameHistory[i][2], 4);
+            memcpy(serverMsg.buffer+28+i*20, &gameHistory[i][3], 4);
+            memcpy(serverMsg.buffer+32+i*20, &gameHistory[i][4], 4);
             delete[] gameHistory[i];
          }