From 1e460721bb6b5856caa623cbe77b4cf8e3598a23 Mon Sep 17 00:00:00 2001 From: Info Teddy Date: Sun, 2 Feb 2020 02:37:23 -0800 Subject: [PATCH] Fix hardcoded (19,8) all-sides warp happening in custom levels (19,8) is hardcoded to warp on all-sides no matter what. This is fine, except for the fact that it was doing this in custom levels, too, even despite the fact that the warp background and color would be overridden anyway. The only workaround was to add a warp line to the room in custom levels. I've added a check for custommode so that this won't happen. --- desktop_version/src/Map.cpp | 2 +- mobile_version/src/mapclass.as | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index b6fbfe3a..e21d5dc0 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -1304,7 +1304,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas } } - if (rx == 119 && ry == 108) + if (rx == 119 && ry == 108 && !custommode) { background = 5; dwgfx.rcol = 3; diff --git a/mobile_version/src/mapclass.as b/mobile_version/src/mapclass.as index 7b328666..e8e01741 100644 --- a/mobile_version/src/mapclass.as +++ b/mobile_version/src/mapclass.as @@ -892,7 +892,7 @@ } } - if (rx == 119 && ry == 108) { + if (rx == 119 && ry == 108 && !custommode) { background = 5; dwgfx.rcol = 3; warpx = true;