diff options
Diffstat (limited to 'tools/mapedit/src/widget.cpp')
-rw-r--r-- | tools/mapedit/src/widget.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/mapedit/src/widget.cpp b/tools/mapedit/src/widget.cpp index 7f90880..fa0af39 100644 --- a/tools/mapedit/src/widget.cpp +++ b/tools/mapedit/src/widget.cpp | |||
@@ -75,30 +75,30 @@ void MapeditWidget::OnPaint(wxPaintEvent&) | |||
75 | 75 | ||
76 | RenderMap(map, dc, tiles_dc); | 76 | RenderMap(map, dc, tiles_dc); |
77 | 77 | ||
78 | if (map->getLeftMoveType() == Map::MoveType::Warp) | 78 | if (map->getAdjacent(Map::MoveDir::Left).type == Map::MoveType::Warp) |
79 | { | 79 | { |
80 | auto tomap = map->getWorld()->getMap(map->getLeftMoveMapID()); | 80 | auto tomap = map->getWorld()->getMap(map->getAdjacent(Map::MoveDir::Left).map); |
81 | 81 | ||
82 | RenderMap(tomap.get(), dc, tiles_dc, -EDITOR_SPACING_X, EDITOR_SPACING_Y, false); | 82 | RenderMap(tomap.get(), dc, tiles_dc, -EDITOR_SPACING_X, EDITOR_SPACING_Y, false); |
83 | } | 83 | } |
84 | 84 | ||
85 | if (map->getRightMoveType() == Map::MoveType::Warp) | 85 | if (map->getAdjacent(Map::MoveDir::Right).type == Map::MoveType::Warp) |
86 | { | 86 | { |
87 | auto tomap = map->getWorld()->getMap(map->getRightMoveMapID()); | 87 | auto tomap = map->getWorld()->getMap(map->getAdjacent(Map::MoveDir::Right).map); |
88 | 88 | ||
89 | RenderMap(tomap.get(), dc, tiles_dc, EDITOR_WIDTH-EDITOR_SPACING_X, EDITOR_SPACING_Y, false); | 89 | RenderMap(tomap.get(), dc, tiles_dc, EDITOR_WIDTH-EDITOR_SPACING_X, EDITOR_SPACING_Y, false); |
90 | } | 90 | } |
91 | 91 | ||
92 | if (map->getUpMoveType() == Map::MoveType::Warp) | 92 | if (map->getAdjacent(Map::MoveDir::Up).type == Map::MoveType::Warp) |
93 | { | 93 | { |
94 | auto tomap = map->getWorld()->getMap(map->getUpMoveMapID()); | 94 | auto tomap = map->getWorld()->getMap(map->getAdjacent(Map::MoveDir::Up).map); |
95 | 95 | ||
96 | RenderMap(tomap.get(), dc, tiles_dc, EDITOR_SPACING_X, -EDITOR_SPACING_Y, false); | 96 | RenderMap(tomap.get(), dc, tiles_dc, EDITOR_SPACING_X, -EDITOR_SPACING_Y, false); |
97 | } | 97 | } |
98 | 98 | ||
99 | if (map->getDownMoveType() == Map::MoveType::Warp) | 99 | if (map->getAdjacent(Map::MoveDir::Down).type == Map::MoveType::Warp) |
100 | { | 100 | { |
101 | auto tomap = map->getWorld()->getMap(map->getDownMoveMapID()); | 101 | auto tomap = map->getWorld()->getMap(map->getAdjacent(Map::MoveDir::Down).map); |
102 | 102 | ||
103 | RenderMap(tomap.get(), dc, tiles_dc, EDITOR_SPACING_X, EDITOR_HEIGHT-EDITOR_SPACING_Y, false); | 103 | RenderMap(tomap.get(), dc, tiles_dc, EDITOR_SPACING_X, EDITOR_HEIGHT-EDITOR_SPACING_Y, false); |
104 | } | 104 | } |