From c28d80fe3bdee9eef9a07ef9cd70bb73cf4dc717 Mon Sep 17 00:00:00 2001 From: qndel Date: Mon, 25 Mar 2019 17:15:07 +0100 Subject: [PATCH] AddL1Objs bin exact (#748) --- Source/objects.cpp | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/Source/objects.cpp b/Source/objects.cpp index 0eef54aa4..b49e9caa3 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -764,28 +764,17 @@ void __cdecl InitRndBarrels() void __fastcall AddL1Objs(int x1, int y1, int x2, int y2) { - int v4; // ebx - int *v5; // edi - int v6; // esi - int x; // [esp+0h] [ebp-8h] - int y; // [esp+4h] [ebp-4h] - - x = x1; - for (y = y1; y < y2; ++y) { - v4 = x; - if (x < x2) { - v5 = (int *)((char *)dPiece + 4 * (y + 112 * x)); - do { - v6 = *v5; - if (*v5 == 270) - AddObject(OBJ_L1LIGHT, v4, y); - if (v6 == 44 || v6 == 51 || v6 == 214) - AddObject(OBJ_L1LDOOR, v4, y); - if (v6 == 46 || v6 == 56) - AddObject(OBJ_L1RDOOR, v4, y); - ++v4; - v5 += 112; - } while (v4 < x2); + int i, j, pn; + + for (i = y1; i < y2; i++) { + for (j = x1; j < x2; j++) { + pn = dPiece[j][i]; + if (pn == 270) + AddObject(OBJ_L1LIGHT, j, i); + if (pn == 44 || pn == 51 || pn == 214) + AddObject(OBJ_L1LDOOR, j, i); + if (pn == 46 || pn == 56) + AddObject(OBJ_L1RDOOR, j, i); } } }