Changeset e76055f in network-game for common

Timestamp:

May 18, 2013, 8:50:33 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

e4a5786

Parents:

d69eb32

Message:

The server now checks if a player got close enough to a flag to pick it up

Location:

common

Files:

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

common/Player.cpp

@@ -113 +113 @@
       }
 
-      //cout << "newPos.x: " << newPos.x << endl;
-      //cout << "newPos.y: " << newPos.y << endl;
-      //cout << "newPos.x/25: " << newPos.x/25 << endl;
-      //cout << "newPos.y/25: " << newPos.y/25 << endl;
-
       switch(map->getElement(newPos.x/25, newPos.y/25)) {
       case WorldMap::TERRAIN_NONE:
+      case WorldMap::TERRAIN_OCEAN:
       case WorldMap::TERRAIN_ROCK:
          cout << "Encountered invalid terrain" << endl;
@@ -132 +128 @@
          break;
       }
+
+      // 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:
+         hasBlueFlag = true;
+         moveCanceled = true;
+         break;
+      case WorldMap::OBJECT_RED_FLAG:
+         hasRedFlag = true;
+         moveCanceled = true;
+         break;
+      }
    }
 

common/WorldMap.h

@@ -19 +19 @@
    enum ObjectType {
       OBJECT_NONE,
-      OBJECT_RED_FLAG,
-      OBJECT_BLUE_FLAG
+      OBJECT_BLUE_FLAG,
+      OBJECT_RED_FLAG
    };