From b0584f19253fbf5d659cb1d7afb42d7146430512 Mon Sep 17 00:00:00 2001 From: Juliano Leal Goncalves Date: Sun, 30 May 2021 19:39:29 -0300 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Simplify=20'GetSuperItemSp?= =?UTF-8?q?ace'=20logic=20using=20'Point'.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/items.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/items.cpp b/Source/items.cpp index 517981860..394db89cf 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -1377,17 +1377,18 @@ int AllocateItem() static void GetSuperItemSpace(Point position, int8_t inum) { - if (GetItemSpace(position, inum)) + Point positionToCheck = position; + if (GetItemSpace(positionToCheck, inum)) return; for (int k = 2; k < 50; k++) { for (int j = -k; j <= k; j++) { - int yy = position.y + j; for (int i = -k; i <= k; i++) { - int xx = i + position.x; - if (!ItemSpaceOk({ xx, yy })) + Point offset = { i, j }; + positionToCheck = position + offset; + if (!ItemSpaceOk(positionToCheck)) continue; - items[inum].position = { xx, yy }; - dItem[xx][yy] = inum + 1; + items[inum].position = positionToCheck; + dItem[positionToCheck.x][positionToCheck.y] = inum + 1; return; } }