Changeset 35f6097 in network-game

Timestamp:

Dec 22, 2013, 11:22:46 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

e62b56c

Parents:

5ae8dca

Message:

Players are revived correctly in individual games

File:

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

server/server.cpp

@@ -163 +163 @@
             if (p->isDead)
             {
+
                if (getCurrentMillis() - p->timeDied >= 10000)
                {
@@ -172 +173 @@
                   {
                   case 0:// blue team
-                     spawnPos = gameMap->getStructureLocation(WorldMap::STRUCTURE_BLUE_FLAG);
+                     spawnPos = p->currentGame->getMap()->getStructureLocation(WorldMap::STRUCTURE_BLUE_FLAG);
                      break;
                   case 1:// red team
-                     spawnPos = gameMap->getStructureLocation(WorldMap::STRUCTURE_RED_FLAG);
+                     spawnPos = p->currentGame->getMap()->getStructureLocation(WorldMap::STRUCTURE_RED_FLAG);
                      break;
                   default:
@@ -195 +196 @@
 
                   map<unsigned int, Player*>::iterator it2;
-                  for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++)
-                  {
-                     if ( msgProcessor.sendMessage(&serverMsg, sock, &(p->addr), &outputLog) < 0 )
+                  for (it2 = p->currentGame->getPlayers().begin(); it2 != p->currentGame->getPlayers().end(); it2++)
+                  {
+                     if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second->addr), &outputLog) < 0 )
                         error("sendMessage");
                   }