From bab52c023783b8526cfa193d75d45700913d97e0 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 2 May 2021 11:34:42 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8FClean=20up=20CreateDoorType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apply early returns --- Source/drlg_l2.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp index e68ee9ed6..721ca88a1 100644 --- a/Source/drlg_l2.cpp +++ b/Source/drlg_l2.cpp @@ -1929,29 +1929,23 @@ static void DefineRoom(int nX1, int nY1, int nX2, int nY2, bool ForceHW) static void CreateDoorType(int nX, int nY) { - bool fDoneflag; - - fDoneflag = false; - if (predungeon[nX - 1][nY] == 68) { - fDoneflag = true; + return; } if (predungeon[nX + 1][nY] == 68) { - fDoneflag = true; + return; } if (predungeon[nX][nY - 1] == 68) { - fDoneflag = true; + return; } if (predungeon[nX][nY + 1] == 68) { - fDoneflag = true; + return; } if (predungeon[nX][nY] == 66 || predungeon[nX][nY] == 67 || predungeon[nX][nY] == 65 || predungeon[nX][nY] == 69) { - fDoneflag = true; + return; } - if (!fDoneflag) { - predungeon[nX][nY] = 68; - } + predungeon[nX][nY] = 68; } static void PlaceHallExt(int nX, int nY) @@ -2085,7 +2079,7 @@ static void CreateRoom(int nX1, int nY1, int nX2, int nY2, int nRDest, int nHDir nHh = RoomList[nRDest].nRoomy2 - RoomList[nRDest].nRoomy1 - 2; nHy2 = GenerateRnd(nHh) + RoomList[nRDest].nRoomy1 + 1; } - HallList.push_back({nHx1, nHy1, nHx2, nHy2, nHDir}); + HallList.push_back({ nHx1, nHy1, nHx2, nHy2, nHDir }); } if (nRh > nRw) {