Changeset 227baaa in network-game for common

Timestamp:

Apr 23, 2013, 1:43:13 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

d211210

Parents:

a1a3bd5

Message:

Fixed some syntax errors related to the player move method

Location:

common

Files:

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

common/Player.cpp

@@ -83 +83 @@
 }
 
-bool Player::move(WorldMap map) {
+bool Player::move(WorldMap *map) {
    int speed = 100; // pixels per second
    unsigned long long curTime = getCurrentMillis();
@@ -102 +102 @@
          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;
+         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;
          }
       }

common/Player.h

@@ -33 +33 @@
    void setAddr(sockaddr_in addr);
 
-   bool move(WorldMap map);
+   bool move(WorldMap *map);
 
    int id;