Changeset 05051c7 in network-game for common/Player.cpp

Timestamp:

May 19, 2013, 7:12:07 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

cc1c6c1

Parents:

035d852

Message:

Added support for objects that can be at any pixel on the map, not just one per grid cell. What used to be called objects are now caled structures

File:

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

common/Player.cpp

@@ -124 +124 @@
       // using moveCanceled in a hacky way just to indicate that the server
       // has updated some player info. Should change the variable name
-      switch(map->getObject(newPos.x/25, newPos.y/25)) {
-      case WorldMap::OBJECT_BLUE_FLAG:
+      switch(map->getStructure(newPos.x/25, newPos.y/25)) {
+      case WorldMap::STRUCTURE_BLUE_FLAG:
          hasBlueFlag = true;
          moveCanceled = true;
          break;
-      case WorldMap::OBJECT_RED_FLAG:
+      case WorldMap::STRUCTURE_RED_FLAG:
          hasRedFlag = true;
          moveCanceled = true;