Changeset 7f884ea in network-game for common/WorldMap.h

Timestamp:

Jan 24, 2014, 12:27:15 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

f66d04f

Parents:

e70b66b

Message:

Map-related structs are now outside of the WorldMap class

File:

• common/WorldMap.h (modified) (2 diffs)

common/WorldMap.h

@@ -9 +9 @@
 using namespace std;
 
+enum TerrainType {
+   TERRAIN_NONE,
+   TERRAIN_GRASS,
+   TERRAIN_OCEAN,
+   TERRAIN_ROCK
+};
+
+enum StructureType {
+   STRUCTURE_NONE,
+   STRUCTURE_BLUE_FLAG,
+   STRUCTURE_RED_FLAG
+};
+
+enum ObjectType {
+   OBJECT_NONE,
+   OBJECT_BLUE_FLAG,
+   OBJECT_RED_FLAG
+};
+
 class WorldMap {
 public:
-   enum TerrainType {
-      TERRAIN_NONE,
-      TERRAIN_GRASS,
-      TERRAIN_OCEAN,
-      TERRAIN_ROCK
-   };
-
-   enum StructureType {
-      STRUCTURE_NONE,
-      STRUCTURE_BLUE_FLAG,
-      STRUCTURE_RED_FLAG
-   };
-
-   enum ObjectType {
-      OBJECT_NONE,
-      OBJECT_BLUE_FLAG,
-      OBJECT_RED_FLAG
-   };
-
    class Object {
    public:
@@ -67 +67 @@
 
    void addObject(ObjectType type, int x, int y);
-   void updateObject(unsigned int id, WorldMap::ObjectType t, int x, int y);
+   void updateObject(unsigned int id, ObjectType t, int x, int y);
    bool removeObject(unsigned int id);