Changeset a1a3bd5 in network-game for common/Player.cpp

Timestamp:

Apr 23, 2013, 1:31:54 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

227baaa

Parents:

054b50b

Message:

Made client changes for smooth player movement, changed the player move method to check the map for obstacles and return a bool indicating success or failure.

File:

• common/Player.cpp (modified) (1 diff)

common/Player.cpp

@@ -83 +83 @@
 }
 
-void Player::move(void) {
+bool Player::move(WorldMap map) {
    int speed = 100; // pixels per second
    unsigned long long curTime = getCurrentMillis();
+   bool moveCanceled = false;
 
    // if we're at our target, don't move
    if (pos.x != target.x || pos.y != target.y) {
       float pixels = speed * (curTime-timeLastUpdated) / 1000.0;
+      double angle = atan2(target.y-pos.y, target.x-pos.x);
+      float dist = sqrt(pow(target.x-pos.x, 2) + pow(target.y-pos.y, 2));
+      POSITION newPos;
 
-      double angle = atan2(target.y-pos.y, target.x-pos.x);
-
-      float dist = sqrt(pow(target.x-pos.x, 2) + pow(target.y-pos.y, 2));
       if (dist <= pixels) {
          pos.x = target.x;
          pos.y = target.y;
       }else {
-         pos.x += cos(angle)*pixels;
-         pos.y += sin(angle)*pixels;
+         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.TerrainType.TERRAIN_OCEAN:
+            case WorldMap.TerrainType.TERRAIN_ROCK:
+               target.x = pos.x;
+               target.y = pos.y;
+               moveCanceled = true;
+               break;
+         }
       }
    }
 
    timeLastUpdated = curTime;
+   return !moveCanceled;
 }