diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-17 15:55:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-17 15:55:37 -0400 |
commit | 90aadf3844386824140a20d7fbb847bc16009a94 (patch) | |
tree | 6f83fce90e71abb22b1a8f3e09c79963b2a34d5d /tools/mapedit/src/map.cpp | |
parent | bc63fa57ced1c7329f7fdcfd168eaf7e290158bc (diff) | |
parent | 86f0106d0523825549f1e74b835688c78a10cf6c (diff) | |
download | therapy-90aadf3844386824140a20d7fbb847bc16009a94.tar.gz therapy-90aadf3844386824140a20d7fbb847bc16009a94.tar.bz2 therapy-90aadf3844386824140a20d7fbb847bc16009a94.zip |
Merge pull request #7 from hatkirby/es-rewrite
The ECS rewrite exceeds the original branch in functionality, so it is time to merge it in.
Diffstat (limited to 'tools/mapedit/src/map.cpp')
-rw-r--r-- | tools/mapedit/src/map.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/mapedit/src/map.cpp b/tools/mapedit/src/map.cpp index a099e29..7e6c3c0 100644 --- a/tools/mapedit/src/map.cpp +++ b/tools/mapedit/src/map.cpp | |||
@@ -188,6 +188,11 @@ const Map::Adjacent& Map::getAdjacent(MoveDir direction) const | |||
188 | } | 188 | } |
189 | } | 189 | } |
190 | 190 | ||
191 | size_t Map::getNextObjectIndex() const | ||
192 | { | ||
193 | return nextObjectIndex; | ||
194 | } | ||
195 | |||
191 | void Map::setTitle(std::string title, bool dirty) | 196 | void Map::setTitle(std::string title, bool dirty) |
192 | { | 197 | { |
193 | this->title = title; | 198 | this->title = title; |
@@ -271,3 +276,12 @@ void Map::setAdjacent(MoveDir direction, MoveType type, int map, bool dirty) | |||
271 | } | 276 | } |
272 | } | 277 | } |
273 | 278 | ||
279 | size_t Map::getAndIncrementNextObjectIndex() | ||
280 | { | ||
281 | return nextObjectIndex++; | ||
282 | } | ||
283 | |||
284 | void Map::setNextObjectIndex(size_t v) | ||
285 | { | ||
286 | nextObjectIndex = v; | ||
287 | } | ||