summaryrefslogtreecommitdiffstats
path: root/src/model/Map.hpp
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2014-09-26 03:13:26 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2014-09-26 03:13:26 +0200
commit124116a8bf56ccc742e6efcb3b9e83abe97bf143 (patch)
tree7ab23aab342477c80af3a0e5c8fb98da90c94548 /src/model/Map.hpp
parent9b91d6f3d0187e0daf29a262cf19ad08ba2b7cf5 (diff)
downloadrpgedit-124116a8bf56ccc742e6efcb3b9e83abe97bf143.tar
rpgedit-124116a8bf56ccc742e6efcb3b9e83abe97bf143.zip
Extend map model with rotated tiles
Diffstat (limited to 'src/model/Map.hpp')
-rw-r--r--src/model/Map.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/model/Map.hpp b/src/model/Map.hpp
index b8a8e18..ed58fd6 100644
--- a/src/model/Map.hpp
+++ b/src/model/Map.hpp
@@ -43,7 +43,7 @@ namespace Model {
class _Map {
protected:
- std::vector<std::string> tileset;
+ std::vector<std::pair<std::string, int>> tileset;
size_t width, height;
std::vector<CollisionType> collision;
@@ -160,11 +160,11 @@ public:
entityStates = std::move(other.entityStates);
}
- std::vector<std::string> & getTileset() {
+ std::vector<std::pair<std::string, int>> & getTileset() {
return tileset;
}
- const std::vector<std::string> & getTileset() const {
+ const std::vector<std::pair<std::string, int>> & getTileset() const {
return tileset;
}