Changeset 99afbb8 in network-game for server

Timestamp:

Sep 26, 2013, 2:59:02 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

2ee386d

Parents:

50e6c7a

Message:

The server keeps track of games and adds players to them

File:

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

server/server.cpp

@@ -35 +35 @@
 #include "../common/Player.h"
 #include "../common/Projectile.h"
+#include "../common/Game.h"
 
 #include "DataAccess.h"
@@ -44 +45 @@
 // 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, MessageProcessor &msgProcessor, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedPlayerId, NETWORK_MSG &serverMsg, int sock, int &scoreBlue, int &scoreRed, ofstream& outputLog);
+bool processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map<unsigned int, Player>& mapPlayers, map<string, Game>& mapGames, WorldMap* gameMap, unsigned int& unusedPlayerId, NETWORK_MSG &serverMsg, int sock, int &scoreBlue, int &scoreRed, ofstream& outputLog);
 
 void updateUnusedPlayerId(unsigned int& id, map<unsigned int, Player>& mapPlayers);
@@ -99 +100 @@
    map<unsigned int, Player> mapPlayers;
    map<unsigned int, Projectile> mapProjectiles;
+   map<string, Game> mapGames;
    unsigned int unusedPlayerId = 1, unusedProjectileId = 1;
    int scoreBlue, scoreRed;
@@ -530 +532 @@
 
       if (n >= 0) {
-         broadcastResponse = processMessage(clientMsg, from, msgProcessor, mapPlayers, gameMap, unusedPlayerId, serverMsg, sock, scoreBlue, scoreRed, outputLog);
+         broadcastResponse = processMessage(clientMsg, from, msgProcessor, mapPlayers, mapGames, gameMap, unusedPlayerId, serverMsg, sock, scoreBlue, scoreRed, outputLog);
 
          if (broadcastResponse)
@@ -560 +562 @@
 }
 
-bool processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedPlayerId, NETWORK_MSG &serverMsg, int sock, int &scoreBlue, int &scoreRed, ofstream& outputLog)
+bool processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map<unsigned int, Player>& mapPlayers, map<string, Game>& mapGames, WorldMap* gameMap, unsigned int& unusedPlayerId, NETWORK_MSG &serverMsg, int sock, int &scoreBlue, int &scoreRed, ofstream& outputLog)
 {
    DataAccess da;
@@ -933 +935 @@
          cout << "Game name: " << gameName << endl;
 
-         // temp var
-         int numPlayers = 0;
+         mapGames[gameName] = Game(gameName);
+         mapGames[gameName].addPlayer(findPlayerByAddr(mapPlayers, from));
+         int numPlayers = mapGames[gameName].getNumPlayers();
 
          serverMsg.type = MSG_TYPE_GAME_INFO;
@@ -950 +953 @@
          cout << "Game name: " << gameName << endl;
 
-         // temp var
-         int numPlayers = 0;
+         mapGames[gameName].addPlayer(findPlayerByAddr(mapPlayers, from));
+         int numPlayers = mapGames[gameName].getNumPlayers();
 
          serverMsg.type = MSG_TYPE_GAME_INFO;