Changeset d69eb32 in network-game for server/server.cpp

Timestamp:

May 18, 2013, 8:30:53 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

e76055f

Parents:

430c80e

Message:

Re-enabled sending PLAYER_MOVE messages when a player encounters an obstacle

File:

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

server/server.cpp

@@ -117 +117 @@
       clock_gettime(CLOCK_REALTIME, &ts);
       // make the number smaller so millis can fit in an int
-      ts.tv_sec = ts.tv_sec & 0x3fffff;
+      ts.tv_sec -= 1368000000;
       curTime = ts.tv_sec*1000 + ts.tv_nsec/1000000;
 
       if (timeLastUpdated == 0 || (curTime-timeLastUpdated) >= 50) {
          timeLastUpdated = curTime;
+         //cout << "Server-side player movement: " << timeLastUpdated << endl;
 
          // maybe put this in a separate method
@@ -128 +129 @@
             if (!it->second.move(gameMap)) {
                cout << "Cenceling move" << endl;
-               //serverMsg.type = MSG_TYPE_PLAYER;
-               //it->second.serialize(serverMsg.buffer);
+               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");
+                  if ( sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 )
+                     error("sendMessage");
                }
             }