From ccb3d6e97472b34cf97d5988ae9fa63d1ddf658d Mon Sep 17 00:00:00 2001 From: Misa Date: Thu, 9 Jul 2020 03:21:18 -0700 Subject: [PATCH] Use case-switch for warpdir checking Also, there's no need to put the entire warpdir checking in an 'if(room.warpdir>0)' statement. If any of the cases is jumped to, then you already know that's true. --- desktop_version/src/Map.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 90288b33..bae361ee 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -1661,20 +1661,23 @@ void mapclass::loadlevel(int rx, int ry) if(redrawbg){ graphics.backgrounddrawn = false; } - if(room.warpdir>0){ - if(room.warpdir==1){ + switch (room.warpdir) + { + case 1: warpx=true; background=3; graphics.rcol = ed.getwarpbackground(rx-100,ry-100); - }else if(room.warpdir==2){ + break; + case 2: warpy=true; background=4; graphics.rcol = ed.getwarpbackground(rx-100,ry-100); - }else if(room.warpdir==3){ + break; + case 3: warpx=true; warpy=true; background = 5; graphics.rcol = ed.getwarpbackground(rx-100,ry-100); - } + break; } roomname = room.roomname;