Changeset 2e63b64 in network-game for server

Timestamp:

Dec 28, 2013, 4:21:05 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

eb2ad4f

Parents:

bcfd99a

Message:

gameMap removed from server

File:

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

server/server.cpp

@@ -44 +44 @@
 // from used to be const. Removed that so I could take a reference
 // and use it to send messages
-void 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);
+void processMessage(const NETWORK_MSG& clientMsg, struct sockaddr_in& from, MessageProcessor& msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, unsigned int& unusedPlayerId);
 
 bool handleGameEvents(Game* game, map<unsigned int, Player*>& mapPlayers, MessageProcessor& msgPocessor);
@@ -90 +90 @@
    outputLog.open("server.log", ios::app);
    outputLog << "Started server on " << getCurrentDateTimeString() << endl;
-
-   WorldMap* gameMap = WorldMap::loadMapFromFile("../data/map.txt");
-
-   // add some items to the map. They will be sent out
-   // to players when they login
-   for (int y=0; y<gameMap->height; y++)
-   {
-      for (int x=0; x<gameMap->width; x++)
-      {
-         switch (gameMap->getStructure(x, y))
-         {
-            case WorldMap::STRUCTURE_BLUE_FLAG:
-               gameMap->addObject(WorldMap::OBJECT_BLUE_FLAG, x*25+12, y*25+12);
-               break;
-            case WorldMap::STRUCTURE_RED_FLAG:
-               gameMap->addObject(WorldMap::OBJECT_RED_FLAG, x*25+12, y*25+12);
-               break;
-         }
-      }
-   }
 
    sock = socket(AF_INET, SOCK_DGRAM, 0);
@@ -212 +192 @@
          map<string, Game*>::iterator itGames;
          Game* game = NULL;
-         WorldMap* gameMap = NULL;
 
          for (itGames = mapGames.begin(); itGames != mapGames.end();) { 
@@ -268 +247 @@
       if (msgProcessor.receiveMessage(&clientMsg, &from) >= 0)
       {
-         processMessage(clientMsg, from, msgProcessor, mapPlayers, mapGames, gameMap, unusedPlayerId);
+         processMessage(clientMsg, from, msgProcessor, mapPlayers, mapGames, unusedPlayerId);
 
          cout << "Finished processing the message" << endl;
@@ -293 +272 @@
 }
 
-void 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)
+void processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, unsigned int& unusedPlayerId)
 {
    NETWORK_MSG serverMsg;