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/widget.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/widget.cpp')
| -rw-r--r-- | tools/mapedit/src/widget.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
| diff --git a/tools/mapedit/src/widget.cpp b/tools/mapedit/src/widget.cpp index 8d74b39..85838e6 100644 --- a/tools/mapedit/src/widget.cpp +++ b/tools/mapedit/src/widget.cpp | |||
| @@ -256,7 +256,12 @@ void MapeditWidget::OnClick(wxMouseEvent& event) | |||
| 256 | int x = (event.GetPosition().x + vX - EDITOR_SPACING_X*scale) / scale - (addingEntity->getWidth() / 2); | 256 | int x = (event.GetPosition().x + vX - EDITOR_SPACING_X*scale) / scale - (addingEntity->getWidth() / 2); |
| 257 | int y = (event.GetPosition().y + vY - EDITOR_SPACING_Y*scale) / scale - (addingEntity->getHeight() / 2); | 257 | int y = (event.GetPosition().y + vY - EDITOR_SPACING_Y*scale) / scale - (addingEntity->getHeight() / 2); |
| 258 | 258 | ||
| 259 | auto data = std::make_shared<MapObjectEntry>(*addingEntity, x, y); | 259 | auto data = std::make_shared<MapObjectEntry>( |
| 260 | *addingEntity, | ||
| 261 | x, | ||
| 262 | y, | ||
| 263 | map->getAndIncrementNextObjectIndex()); | ||
| 264 | |||
| 260 | frame->commitAction(std::make_shared<Undoable>("Add " + addingEntity->getName(), [=] () { | 265 | frame->commitAction(std::make_shared<Undoable>("Add " + addingEntity->getName(), [=] () { |
| 261 | map->addObject(data); | 266 | map->addObject(data); |
| 262 | 267 | ||