From 23434f084234045254ae96ee4255f2a10bd703d3 Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 9 Sep 2020 15:45:03 -0700 Subject: [PATCH] Fix misleading indentation in obj.customwarpmode block This misleading indentation makes it really easy to misanalyze this block as only containing the statements up to obj.customwarplinecheck(), when in reality it contains everything up to the modifying of map.warpx/map.warpy. I have made this misanalysis just now in my attempt to figure out the pre-2.1 warp line bypass glitch, and I don't like it. So I'm fixing this indentation now. --- desktop_version/src/Logic.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index f163d71c..62daf06b 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -1030,14 +1030,14 @@ void gamelogic() int i = obj.getplayer(); if (i > -1 && ((game.door_down > -2 && obj.entities[i].yp >= 226-16) || (game.door_up > -2 && obj.entities[i].yp < -2+16) || (game.door_left > -2 && obj.entities[i].xp < -14+16) || (game.door_right > -2 && obj.entities[i].xp >= 308-16))){ - //Player is leaving room - obj.customwarplinecheck(i); - } + //Player is leaving room + obj.customwarplinecheck(i); + } - if(obj.customwarpmodehon){ map.warpy=true; - }else{ map.warpy=false; } - if(obj.customwarpmodevon){ map.warpx=true; - }else{ map.warpx=false; } + if(obj.customwarpmodehon){ map.warpy=true; + }else{ map.warpy=false; } + if(obj.customwarpmodevon){ map.warpx=true; + }else{ map.warpx=false; } } //Finally: Are we changing room?