Changeset 74b8e79 in network-game

Timestamp:

May 18, 2013, 7:21:55 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

876add0

Parents:

7d91bbe

Message:

Deleted some commented code

Files:

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

common/Player.h

@@ -46 +46 @@
 
    int team; // 0 is blue, 1 is red
-      bool hasBlueFlag;
+   bool hasBlueFlag;
    bool hasRedFlag;
 };

server/server.cpp

@@ -383 +383 @@
                cout << "valid terrain" << 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;
                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;
-               //cout << "xDiff: " << xDiff << endl;
-               //cout << "yDiff: " << yDiff << endl;
-
-               // then we get the correct angle
-               double angle = atan2(yDiff, xDiff);
-               cout << "angle: " << angle << endl;
-
-               // finally we use the angle to determine
-               // how much the player moves
-               // the player will move 50 pixels in the correct direction
-               //mapPlayers[id].pos.x += cos(angle)*50;
-               //mapPlayers[id].pos.y += sin(angle)*50;
 
                serverMsg.type = MSG_TYPE_PLAYER_MOVE;
@@ -408 +393 @@
                memcpy(serverMsg.buffer+4, &mapPlayers[id].target.x, 4);
                memcpy(serverMsg.buffer+8, &mapPlayers[id].target.y, 4);
-               //memcpy(serverMsg.buffer, clientMsg.buffer, 12);
 
                broadcastResponse = true;