Changeset b07eeac in network-game

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

Files:

• common/Common.cpp (modified) (3 diffs)
• common/Common.h (modified) (2 diffs)
• common/Message.cpp (modified) (1 diff)
• server/server.cpp (modified) (3 diffs)

common/Common.cpp

@@ -2 +2 @@
 
 #include <iostream>
-using namespace std;
+#include <cmath>
 
 #if defined WINDOWS
@@ -9 +9 @@
    #include <time.h>
 #endif
+
+using namespace std;
+
+/*
+FLOAT_POSITION POSITION::toFloat() {
+   FLOAT_POSITION floatPosition;
+   floatPosition.x = x;
+   floatPosition.y = y;
+
+   return floatPosition;
+}
+*/
 
 void set_nonblock(int sock)
@@ -38 +50 @@
    return numMilliseconds;
 }
+
+float posDistance(FLOAT_POSITION pos1, FLOAT_POSITION pos2) {
+   float xDiff = pos2.x - pos1.x;
+   float yDiff = pos2.y - pos1.y;
+
+   return sqrt( pow(xDiff,2) + pow(yDiff,2) );   
+}

common/Common.h

@@ -12 +12 @@
 #endif
 
-void set_nonblock(int sock);
-unsigned long long getCurrentMillis();
-
-typedef struct
-{
-   int x;
-   int y;
-} POSITION;
-
 typedef struct
 {
@@ -27 +18 @@
 } FLOAT_POSITION;
 
+typedef struct
+{
+   int x;
+   int y;
+   //FLOAT_POSITION toFloat();
+   FLOAT_POSITION toFloat() {
+      FLOAT_POSITION floatPosition;
+      floatPosition.x = x;
+      floatPosition.y = y;
+
+      return floatPosition;
+   }
+} POSITION;
+
+void set_nonblock(int sock);
+unsigned long long getCurrentMillis();
+float posDistance(FLOAT_POSITION pos1, FLOAT_POSITION pos2);
+
 #endif

common/Message.cpp

@@ -19 +19 @@
    int ret =  sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
 
+   cout << "Send a message of type " << msg->type << endl;
+
    return ret;
 }

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;