Changeset d211210 in network-game

Timestamp:

May 9, 2013, 1:32:42 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

db58227

Parents:

227baaa

Message:

Add server-side checking of player movement

Files:

• common/Player.cpp (modified) (1 diff)
• server/server.cpp (modified) (14 diffs)

common/Player.cpp

@@ -95 +95 @@
       POSITION newPos;
 
+      //cout << "pos.x: " << pos.x << endl;
+      //cout << "pos.y: " << pos.y << endl;
+      //cout << "target.x: " << target.x << endl;
+      //cout << "target.y: " << target.y << endl;
+
       if (dist <= pixels) {
-         pos.x = target.x;
-         pos.y = target.y;
+         newPos.x = target.x;
+         newPos.y = target.y;
       }else {
          newPos.x = int(pos.x + cos(angle)*pixels);
          newPos.y = int(pos.y + sin(angle)*pixels);
+      }
 
-         switch(map->getElement(newPos.x/25, newPos.y/25)) {
-         case WorldMap::TERRAIN_NONE:
-         case WorldMap::TERRAIN_ROCK:
-            target.x = pos.x;
-            target.y = pos.y;
-            moveCanceled = true;
-            break;
-         }
+      //cout << "newPos.x: " << newPos.x << endl;
+      //cout << "newPos.y: " << newPos.y << endl;
+      //cout << "newPos.x/25: " << newPos.x/25 << endl;
+      //cout << "newPos.y/25: " << newPos.y/25 << endl;
+
+      switch(map->getElement(newPos.x/25, newPos.y/25)) {
+      case WorldMap::TERRAIN_NONE:
+      case WorldMap::TERRAIN_ROCK:
+         cout << "Encountered invalid terrain" << endl;
+         target.x = pos.x;
+         target.y = pos.y;
+         moveCanceled = true;
+         cout << "move canceled" << endl;
+         break;
+      default: // if there are no obstacles
+         pos.x = newPos.x;
+         pos.y = newPos.y;
+         break;
       }
    }
 
    timeLastUpdated = curTime;
+
+   if (moveCanceled)
+      cout << "moveCancled == true" << endl;
+
    return !moveCanceled;
 }

server/server.cpp

@@ -11 +11 @@
 #include <map>
 
+#include <sys/time.h>
+
 #include <sys/socket.h>
 #include <netdb.h>
@@ -34 +36 @@
 using namespace std;
 
-bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG &serverMsg);
+// 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, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG &serverMsg, int sock);
 
 void updateUnusedId(unsigned int& id, map<unsigned int, Player>& mapPlayers);
@@ -124 +128 @@
 
    bool broadcastResponse;
+   timespec ts;
+   long timeLastUpdated = 0, curTime = 0;
    while (true) {
 
       usleep(5000);
+
+      clock_gettime(CLOCK_REALTIME, &ts);
+      curTime = ts.tv_sec + ts.tv_nsec*1000000000;
+
+      if (timeLastUpdated == 0 || (curTime-timeLastUpdated) >= 50000) {
+         timeLastUpdated = curTime;
+
+         // maybe put this in a separate method
+         map<unsigned int, Player>::iterator it, it2;
+         for (it = mapPlayers.begin(); it != mapPlayers.end(); it++) {
+            if (!it->second.move(gameMap)) {
+               cout << "Cenceling move" << endl;
+               //serverMsg.type = MSG_TYPE_PLAYER;
+               //it->second.serialize(serverMsg.buffer);
+
+               cout << "about to send move cencellation" << endl;
+               for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++)
+               {
+                  //if ( sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 )
+                    // error("sendMessage");
+               }
+            }
+         }
+      }
 
       n = receiveMessage(&clientMsg, sock, &from);
@@ -133 +163 @@
          cout << "Got a message" << endl;
 
-         broadcastResponse = processMessage(clientMsg, from, mapPlayers, gameMap, unusedId, serverMsg);
+         broadcastResponse = processMessage(clientMsg, from, mapPlayers, gameMap, unusedId, serverMsg, sock);
 
          // probably replace this with a function that prints based on the
@@ -146 +176 @@
             for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
             {
+               cout << "Sent message back to " << it->second.name << endl;
                if ( sendMessage(&serverMsg, sock, &(it->second.addr)) < 0 )
                   error("sendMessage");
@@ -159 +190 @@
       }
 
+      // we don't want to update and broadcast player positions here
+      // when a player sends a position update, we want to check if
+      // it's reasonable and send it out to all other players
+
       // update player positions
+      /*
       map<unsigned int, Player>::iterator it;
       for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
@@ -167 +203 @@
 
       broadcastPlayerPositions(mapPlayers, sock);
+      */
    }
 
@@ -172 +209 @@
 }
 
-bool processMessage(const NETWORK_MSG& clientMsg, const struct sockaddr_in& from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG& serverMsg)
+bool processMessage(const NETWORK_MSG& clientMsg, struct sockaddr_in& from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG& serverMsg, int sock)
 {
    DataAccess da;
@@ -209 +246 @@
          cout << "Got login message" << endl;
 
+         serverMsg.type = MSG_TYPE_LOGIN;
+         
          string username(clientMsg.buffer);
          string password(strchr(clientMsg.buffer, '\0')+1);
@@ -224 +263 @@
          else
          {
+            serverMsg.type = MSG_TYPE_PLAYER;
+
             p->setAddr(from);
             updateUnusedId(unusedId, mapPlayers);
             p->id = unusedId;
+            cout << "new player id: " << p->id << endl;
+
+            // tell the new player about all the existing players
+            cout << "Sending other players to new player" << endl;
+
+            map<unsigned int, Player>::iterator it;
+            for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
+            {
+               it->second.serialize(serverMsg.buffer);
+
+               cout << "sending info about " << it->second.name  << endl;
+               cout << "sending ind " << it->second.id  << endl;
+               if ( sendMessage(&serverMsg, sock, &from) < 0 )
+                  error("sendMessage");
+            }
+
+            p->serialize(serverMsg.buffer);
+            cout << "Should be broadcasting the message" << endl;
+
+            for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
+            {
+               cout << "Sent message back to " << it->second.name << endl;
+               if ( sendMessage(&serverMsg, sock, &(it->second.addr)) < 0 )
+                  error("sendMessage");
+            }
+
+            serverMsg.type = MSG_TYPE_LOGIN;
             mapPlayers[unusedId] = *p;
-
-            // sendd back the new player info to the user
-            p->serialize(serverMsg.buffer);
-         }
-
-         serverMsg.type = MSG_TYPE_LOGIN;
-   
+         }
+
          delete(p);
 
@@ -266 +329 @@
          }
 
-         // should really be serverMsg.type = MSG_TYPE_LOGOUT;
-         serverMsg.type = MSG_TYPE_LOGIN;
+         serverMsg.type = MSG_TYPE_LOGOUT;
 
          break;
@@ -321 +383 @@
                cout << "valid terrain" << endl;
 
-               cout << "orig x: " << mapPlayers[id].pos.x << endl;
-               cout << "orig y: " << mapPlayers[id].pos.y << endl;
+               //cout << "orig x: " << mapPlayers[id].pos.x << endl;
+               //cout << "orig y: " << mapPlayers[id].pos.y << endl;
                // first we get the correct vector
                mapPlayers[id].target.x = x;
@@ -328 +390 @@
                int xDiff = mapPlayers[id].target.x - mapPlayers[id].pos.x;
                int yDiff = mapPlayers[id].target.y - mapPlayers[id].pos.y;
-               cout << "xDiff: " << xDiff << endl;
-               cout << "yDiff: " << yDiff << endl;
+               //cout << "xDiff: " << xDiff << endl;
+               //cout << "yDiff: " << yDiff << endl;
 
                // then we get the correct angle
@@ -344 +406 @@
                
                memcpy(serverMsg.buffer, &id, 4);
-               memcpy(serverMsg.buffer+4, &mapPlayers[id].pos.x, 4);
-               memcpy(serverMsg.buffer+8, &mapPlayers[id].pos.y, 4);
+               memcpy(serverMsg.buffer+4, &mapPlayers[id].target.x, 4);
+               memcpy(serverMsg.buffer+8, &mapPlayers[id].target.y, 4);
                //memcpy(serverMsg.buffer, clientMsg.buffer, 12);