Changeset 05051c7 in network-game for common/WorldMap.h

Timestamp:

May 19, 2013, 7:12:07 PM (12 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/WorldMap.h (modified) (4 diffs)

common/WorldMap.h

@@ -5 +5 @@
 
 #include <vector>
+
+#include "Common.h"
 
 using namespace std;
@@ -17 +19 @@
    };
 
+   enum StructureType {
+      STRUCTURE_NONE,
+      STRUCTURE_BLUE_FLAG,
+      STRUCTURE_RED_FLAG
+   };
+
    enum ObjectType {
       OBJECT_NONE,
@@ -23 +31 @@
    };
 
+   class Object {
+   public:
+      ObjectType type;
+      POSITION pos;
+
+      Object(ObjectType type, int x, int y);
+      Object(ObjectType type, POSITION pos);
+
+      ~Object();
+   };
+
    int width, height;
    vector<vector<TerrainType>*>* vctMap;
-   vector<vector<ObjectType>*>* vctObjects;
+   vector<vector<StructureType>*>* vctStructures;
+   vector<Object>* vctObjects; 
 
    WorldMap(int width, int height);
@@ -34 +54 @@
    void setElement(int x, int y, TerrainType type);
 
-   ObjectType getObject(int x, int y);
-   void setObject(int x, int y, ObjectType type);
+   StructureType getStructure(int x, int y);
+   void setStructure(int x, int y, StructureType type);
+
+   vector<Object> getObjects(int x, int y);
+   void addObject(int x, int y, ObjectType type);
 
    static WorldMap* createDefaultMap();