diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-15 23:24:22 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-15 23:24:22 -0400 |
| commit | 213cab3c04b81428ab715f340bd7c12438fdb980 (patch) | |
| tree | 295d25eac4b94357ac5b9bb4b3fd03130181b956 /tools/mapedit/src/map.h | |
| parent | 25240241e91dc913d20fbb93aa4acc9433dda6a0 (diff) | |
| download | therapy-213cab3c04b81428ab715f340bd7c12438fdb980.tar.gz therapy-213cab3c04b81428ab715f340bd7c12438fdb980.tar.bz2 therapy-213cab3c04b81428ab715f340bd7c12438fdb980.zip | |
Map editor can now add entities to maps
Also fixed a big bug regarding scrolling
Diffstat (limited to 'tools/mapedit/src/map.h')
| -rw-r--r-- | tools/mapedit/src/map.h | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/tools/mapedit/src/map.h b/tools/mapedit/src/map.h index 52e047d..850a66b 100644 --- a/tools/mapedit/src/map.h +++ b/tools/mapedit/src/map.h | |||
| @@ -44,7 +44,7 @@ class MapWriteException: public std::exception | |||
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | struct MapObjectEntry { | 46 | struct MapObjectEntry { |
| 47 | std::shared_ptr<MapObject> object; | 47 | MapObject* object; |
| 48 | std::pair<double, double> position; | 48 | std::pair<double, double> position; |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| @@ -64,7 +64,7 @@ class Map { | |||
| 64 | bool hasUnsavedChanges() const; | 64 | bool hasUnsavedChanges() const; |
| 65 | void setTileAt(int x, int y, int tile); | 65 | void setTileAt(int x, int y, int tile); |
| 66 | int getTileAt(int x, int y) const; | 66 | int getTileAt(int x, int y) const; |
| 67 | std::list<MapObjectEntry> getObjects(); | 67 | std::list<MapObjectEntry>& getObjects(); |
| 68 | 68 | ||
| 69 | private: | 69 | private: |
| 70 | std::list<MapObjectEntry> objects; | 70 | std::list<MapObjectEntry> objects; |