[Scummvm-git-logs] scummvm master -> 70b76dc8deb3f9ac21ad782eba07c8e8dacb6338

dreammaster dreammaster at scummvm.org
Fri Apr 6 13:10:00 CEST 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
70b76dc8de XEEN: Fix teleporting outdoors


Commit: 70b76dc8deb3f9ac21ad782eba07c8e8dacb6338
    https://github.com/scummvm/scummvm/commit/70b76dc8deb3f9ac21ad782eba07c8e8dacb6338
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-06T07:09:50-04:00

Commit Message:
XEEN: Fix teleporting outdoors

Changed paths:
    devtools/create_xeen/constants.cpp
    engines/xeen/dialogs/dialogs_spells.cpp


diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index 9465e35..5ff6946 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 e1a0c22..03e8a49 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 {





More information about the Scummvm-git-logs mailing list