diff options
| author | Paul Gilbert | 2018-04-06 07:09:50 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-04-06 07:09:50 -0400 |
| commit | 70b76dc8deb3f9ac21ad782eba07c8e8dacb6338 (patch) | |
| tree | b7b04128e3e353c5c5f3e9283bc63d16efdf3244 | |
| parent | 73ad01efb49b966cd26915a025b2a3601d7c93e7 (diff) | |
| download | scummvm-rg350-70b76dc8deb3f9ac21ad782eba07c8e8dacb6338.tar.gz scummvm-rg350-70b76dc8deb3f9ac21ad782eba07c8e8dacb6338.tar.bz2 scummvm-rg350-70b76dc8deb3f9ac21ad782eba07c8e8dacb6338.zip | |
XEEN: Fix teleporting outdoors
| -rw-r--r-- | devtools/create_xeen/constants.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/dialogs/dialogs_spells.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp index 9465e359df..5ff6946340 100644 --- a/devtools/create_xeen/constants.cpp +++ b/devtools/create_xeen/constants.cpp @@ -1768,7 +1768,7 @@ const char *const LLOYDS_BEACON = "%s\x3l\n" "x = %d\x3r\t000y = %d\x3""c\x2\v122\t021\f15S\fdet\t060\f15R\fdeturn\x1"; -const char *const HOW_MANY_SQUARES = "\x3""cTeleport\nHow many squares %s (1-9)"; +const char *const HOW_MANY_SQUARES = "\x3""cTeleport\nHow many squares %s (1-9)\n"; const char *const TOWN_PORTAL = "\x3""cTown Portal\x3l\n" diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp index e1a0c22e3e..03e8a491cb 100644 --- a/engines/xeen/dialogs/dialogs_spells.cpp +++ b/engines/xeen/dialogs/dialogs_spells.cpp @@ -850,10 +850,9 @@ int Teleport::execute() { break; } - v = map.mazeLookup(pt, map._isOutdoors ? 0xF : 0xFFFF, 0); + v = map.mazeLookup(pt, 0, map._isOutdoors ? 0xF : 0xFFFF); - if ((v != (map._isOutdoors ? 0 : INVALID_CELL)) && - (!map._isOutdoors || v == SURFTYPE_DWATER)) { + if ((v != (map._isOutdoors ? 0 : INVALID_CELL)) && (!map._isOutdoors || v != SURFTYPE_DWATER)) { party._mazePosition = pt; return 1; } else { |