Changeset b07eeac in network-game for server

Timestamp:

May 25, 2013, 1:45:54 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

2df63d6

Parents:

b81cea1

Message:

Players pick up flags when they get close to the flag objects, not the structres. When a flag is picked up, a REMOVE_OBJECT message is sent

File:

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

server/server.cpp

@@ -161 +161 @@
                }
 
-               switch(gameMap->getStructure(it->second.pos.x/25, it->second.pos.y/25)) {
-                  case WorldMap::STRUCTURE_BLUE_FLAG:
-                     cout << "Got blue flag" << endl;
-                     it->second.hasBlueFlag = true;
-                     broadcastMove = true;
-                     break;
-                  case WorldMap::STRUCTURE_RED_FLAG:
-                     cout << "Got red flag" << endl;
-                     it->second.hasRedFlag = true;
-                     broadcastMove = true;
-                     break;
+               vector<WorldMap::Object> vctObjects = gameMap->getObjects();
+               vector<WorldMap::Object>::iterator itObjects;
+
+               for (itObjects = vctObjects.begin(); itObjects != vctObjects.end(); itObjects++) {
+                  POSITION pos = itObjects->pos;
+                  if (posDistance(it->second.pos, pos.toFloat()) < 10) {
+                     switch (itObjects->type) {
+                        case WorldMap::OBJECT_BLUE_FLAG:
+                           cout << "Got blue flag" << endl;
+                           it->second.hasBlueFlag = true;
+                           broadcastMove = true;
+                           break;
+                        case WorldMap::OBJECT_RED_FLAG:
+                           cout << "Got red flag" << endl;
+                           it->second.hasRedFlag = true;
+                           broadcastMove = true;
+                           break;
+                     }
+
+                     // send a MSG_TYPE_REMOVE_OBJECT message
+                     serverMsg.type = MSG_TYPE_REMOVE_OBJECT;
+                     memcpy(serverMsg.buffer, &itObjects->id, 4);
+
+                     map<unsigned int, Player>::iterator it2;
+                     for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++)
+                     {
+                        if ( sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 )
+                           error("sendMessage");
+                     }
+                  }
                }
 
@@ -179 +198 @@
 
                   cout << "about to broadcast move" << endl;
-                  map<unsigned int, Player>::iterator it, it2;
+                  map<unsigned int, Player>::iterator it2;
                   for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++)
                   {
@@ -415 +434 @@
                mapPlayers[id].target.x = x;
                mapPlayers[id].target.y = y;
-               int xDiff = mapPlayers[id].target.x - mapPlayers[id].pos.x;
-               int yDiff = mapPlayers[id].target.y - mapPlayers[id].pos.y;
 
                serverMsg.type = MSG_TYPE_PLAYER_MOVE;