From fa4776f3966b710d8cb302ceecb0611044d56a90 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 17 Oct 2021 22:15:50 -0600 Subject: [PATCH] cache/MapImageDumper: fix object wall checks --- .../net/runelite/cache/MapImageDumper.java | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/cache/src/main/java/net/runelite/cache/MapImageDumper.java b/cache/src/main/java/net/runelite/cache/MapImageDumper.java index 6973dc86af..7c921b0138 100644 --- a/cache/src/main/java/net/runelite/cache/MapImageDumper.java +++ b/cache/src/main/java/net/runelite/cache/MapImageDumper.java @@ -596,15 +596,8 @@ public class MapImageDumper int drawX = (drawBaseX + localX) * MAP_SCALE; int drawY = (drawBaseY + (Region.Y - object.getSizeY() - localY)) * MAP_SCALE; - // this is a wall - int hash = (localY << 7) + localX + (location.getId() << 14) + 0x4000_0000; - if (object.getWallOrDoor() == 0) - { - hash -= Integer.MIN_VALUE; - } - int rgb = wallColor; - if (hash > 0) + if (object.getWallOrDoor() != 0) { rgb = doorColor; } @@ -721,19 +714,8 @@ public class MapImageDumper continue; } - int hash = (localY << 7) + localX + (location.getId() << 14) + 0x4000_0000; - if (object.getWallOrDoor() == 0) - { - hash -= Integer.MIN_VALUE; - } - - if ((hash >> 29 & 3) != 2) - { - continue; - } - int rgb = 0xFFEE_EEEE; - if (hash > 0) + if (object.getWallOrDoor() != 0) { rgb = 0xFFEE_0000; } @@ -765,7 +747,6 @@ public class MapImageDumper int drawX = (drawBaseX + localX) * MAP_SCALE; int drawY = (drawBaseY + (Region.Y - object.getSizeY() - localY)) * MAP_SCALE; - // ground object if (object.getMapSceneID() != -1) { blitMapDecoration(image, drawX, drawY, object);