ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

cache/MapImageDumper: fix object wall checks

Browse Source
This commit is contained in:
Max Weber
2021-10-17 22:15:50 -06:00
parent 3ca476094c
commit fa4776f396
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cache/src/main/java/net/runelite/cache/MapImageDumper.java vendored
View File

@@ -596,15 +596,8 @@ public class MapImageDumper
int drawX = (drawBaseX + localX) * MAP_SCALE; int drawX = (drawBaseX + localX) * MAP_SCALE;
int drawY = (drawBaseY + (Region.Y - object.getSizeY() - localY)) * 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; int rgb = wallColor;
if (hash > 0) if (object.getWallOrDoor() != 0)
{ {
rgb = doorColor; rgb = doorColor;
} }
@@ -721,19 +714,8 @@ public class MapImageDumper
continue; 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; int rgb = 0xFFEE_EEEE;
if (hash > 0) if (object.getWallOrDoor() != 0)
{ {
rgb = 0xFFEE_0000; rgb = 0xFFEE_0000;
} }
@@ -765,7 +747,6 @@ public class MapImageDumper
int drawX = (drawBaseX + localX) * MAP_SCALE; int drawX = (drawBaseX + localX) * MAP_SCALE;
int drawY = (drawBaseY + (Region.Y - object.getSizeY() - localY)) * MAP_SCALE; int drawY = (drawBaseY + (Region.Y - object.getSizeY() - localY)) * MAP_SCALE;
// ground object
if (object.getMapSceneID() != -1) if (object.getMapSceneID() != -1)
{ {
blitMapDecoration(image, drawX, drawY, object); blitMapDecoration(image, drawX, drawY, object);