From 695f251efa6de02cc0e50b271e5bdfc46feca7dc Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 13 Jun 2019 00:00:58 +0200 Subject: [PATCH] fix/add multiple imports/exports --- .../java/net/runelite/rs/api/RSBuddy.java | 2 +- .../java/net/runelite/rs/api/RSScene.java | 4 +- .../java/net/runelite/rs/api/RSSprite.java | 10 ++--- .../main/java/net/runelite/rs/api/RSTile.java | 4 +- .../net/runelite/rs/api/RSWallDecoration.java | 2 +- .../java/net/runelite/rs/api/RSWorldMap.java | 22 +++++----- runescape-client/src/main/java/Client.java | 4 +- .../main/java/DevicePcmPlayerProvider.java | 10 ++--- .../src/main/java/NetFileRequest.java | 2 +- runescape-client/src/main/java/Scene.java | 6 +-- runescape-client/src/main/java/Sprite.java | 6 +-- .../src/main/java/UnitPriceComparator.java | 2 +- .../src/main/java/WallDecoration.java | 4 +- runescape-client/src/main/java/WorldMap.java | 40 +++++++++---------- .../src/main/java/WorldMapRegion.java | 4 +- runescape-client/src/main/java/class226.java | 6 +-- runescape-client/src/main/java/class39.java | 30 +++++++------- 17 files changed, 79 insertions(+), 79 deletions(-) diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java index 8904aed13d..e13893c244 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java @@ -5,7 +5,7 @@ import net.runelite.mapping.Import; public interface RSBuddy extends ChatPlayer, RSUser { - @Import("world") + @Import("world0") @Override int getWorld(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java index facd9897e0..0949305e33 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java @@ -6,8 +6,8 @@ import net.runelite.mapping.Import; public interface RSScene extends Scene { - //@Import("Scene_gameObjects") --- unused and causing trouble - //RSGameObject[] getObjects(); + @Import("tempGameObjects") + RSGameObject[] getObjects(); @Import("tiles") @Override diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java index 272bdd09a8..d85d4e1427 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java @@ -5,7 +5,7 @@ import net.runelite.mapping.Import; public interface RSSprite extends Sprite { - @Import("drawAt") + @Import("drawAt2") @Override void drawAt(int x, int y); @@ -30,9 +30,9 @@ public interface RSSprite extends Sprite @Import("height") void setMaxHeight(int maxHeight); - @Import("xOffset") - void setOffsetX(int offsetX); - @Import("yOffset") - void setOffsetY(int offsetY); + void setOffsetX(int offsetX); // <-- I don't even know + + @Import("xOffset") + void setOffsetY(int offsetY); // <-- I don't even know } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java index 0e803b8327..735fda68b1 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java @@ -57,8 +57,8 @@ public interface RSTile extends Tile @Import("minPlane") int getPhysicalLevel(); - //@Import("flags") - //int getFlags(); ---- unused, think it's gameobjectedgemask + @Import("gameObjectsEdgeMask") + int getFlags(); @Import("linkedBelowTile") @Override diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java index 32509b1183..4d01d9771b 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java @@ -21,7 +21,7 @@ public interface RSWallDecoration extends DecorativeObject @Import("yOffset") int getYOffset(); - @Import("orientation") + @Import("orientation2") int getOrientation(); @Import("entity1") diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java index ae6b8a4365..eb7f92d551 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java @@ -12,7 +12,7 @@ public interface RSWorldMap extends RenderOverview @Import("worldMapY") int getWorldMapY(); - @Import("zoomTarget") + @Import("zoom") float getWorldMapZoom(); @Import("worldMapTargetX") @@ -21,17 +21,17 @@ public interface RSWorldMap extends RenderOverview @Import("worldMapTargetY") int getWorldMapTargetY(); - //@Import("worldMapDisplayWidth") - //int getWorldMapDisplayWidth(); -//Both unused - //@Import("worldMapDisplayHeight") - //int getWorldMapDisplayHeight(); + @Import("worldMapDisplayWidth") + int getWorldMapDisplayWidth(); - //@Import("worldMapDisplayX") - //int getWorldMapDisplayX(); + @Import("worldMapDisplayHeight") + int getWorldMapDisplayHeight(); - //@Import("worldMapDisplayY") - //int getWorldMapDisplayY(); + @Import("worldMapDisplayX") + int getWorldMapDisplayX(); + + @Import("worldMapDisplayY") + int getWorldMapDisplayY(); @Import("setWorldMapPosition") void setWorldMapPosition(int worldMapX, int worldMapY, boolean changedSurface); @@ -47,7 +47,7 @@ public interface RSWorldMap extends RenderOverview @Override void initializeWorldMap(WorldMapData var1); - @Import("mainMapArea") + @Import("getCurrentMapArea") @Override RSWorldMapArea getWorldMapData(); } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 9dd78cb754..7cedb7c49e 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -4694,11 +4694,11 @@ public final class Client extends GameShell implements Usernamed { Rasterizer2D.Rasterizer2D_resetClip(); if(showMouseCross) { if(mouseCrossColor == 1) { - KeyHandler.crossSprites[mouseCrossState / 100].__a_505(mouseCrossX - 8, mouseCrossY - 8); + KeyHandler.crossSprites[mouseCrossState / 100].drawAt2(mouseCrossX - 8, mouseCrossY - 8); } if(mouseCrossColor == 2) { - KeyHandler.crossSprites[mouseCrossState / 100 + 4].__a_505(mouseCrossX - 8, mouseCrossY - 8); + KeyHandler.crossSprites[mouseCrossState / 100 + 4].drawAt2(mouseCrossX - 8, mouseCrossY - 8); } } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index d2cc9dfb49..dd7a71cf5d 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -367,7 +367,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if(var10.inventorySprites != null && var30 < 20) { Sprite var42 = var10.getInventorySprite(var30); if(var42 != null) { - var42.__a_505(var22, var23); + var42.drawAt2(var22, var23); } else if(Widget.__ho_j) { class22.method295(var10); } @@ -438,7 +438,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } else if(var10 == BoundaryObject.__ej_jv && var30 == Client.__client_jz) { var27.__h_508(var22, var23, 128); } else { - var27.__a_505(var22, var23); + var27.drawAt2(var22, var23); } } else { class22.method295(var10); @@ -536,7 +536,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if(!var10.isIf3) { var37 = var10.getSprite(class238.runCs1(var10)); if(var37 != null) { - var37.__a_505(var12, var13); + var37.drawAt2(var12, var13); } else if(Widget.__ho_j) { class22.method295(var10); } @@ -561,7 +561,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } else if(var14 != 0) { var37.__c_509(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); } else if(var20 == var10.width && var21 == var10.height) { - var37.__a_505(var12, var13); + var37.drawAt2(var12, var13); } else { var37.__j_506(var12, var13, var10.width, var10.height); } @@ -577,7 +577,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } else if(var14 != 0) { var37.__h_508(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255)); } else { - var37.__a_505(var12 + var20 * var24, var13 + var25 * var21); + var37.drawAt2(var12 + var20 * var24, var13 + var25 * var21); } } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index afd1e99e19..7420f200e2 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -106,7 +106,7 @@ public class NetFileRequest extends DualNode { if(var7 > 2500) { var4.__ac_512(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); } else { - var4.__a_505(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); + var4.drawAt2(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); } } diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index c69f8c4a90..2f474a0fc0 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -466,7 +466,7 @@ public class Scene { var14.entity1 = var5; var14.entity2 = var6; var14.orientation = var7; - var14.int7 = var8; + var14.orientation2 = var8; var14.xOffset = var9; var14.yOffset = var10; @@ -1467,7 +1467,7 @@ public class Scene { var14 = var13.x - Scene_cameraX; var15 = var13.tileHeight - Scene_cameraY; var16 = var13.y - Scene_cameraZ; - var17 = var13.int7; + var17 = var13.orientation2; if(var17 != 1 && var17 != 2) { var18 = var14; } else { @@ -1737,7 +1737,7 @@ public class Scene { var11 = var29.x - Scene_cameraX; var25 = var29.tileHeight - Scene_cameraY; var24 = var29.y - Scene_cameraZ; - var14 = var29.int7; + var14 = var29.orientation2; if(var14 != 1 && var14 != 2) { var15 = var11; } else { diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index cf227899b3..a416d44c18 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -271,8 +271,8 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("a") - @Export("__a_505") - public void __a_505(int var1, int var2) { + @Export("drawAt2") + public void drawAt2(int var1, int var2) { var1 += this.yOffset; var2 += this.xOffset; int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -385,7 +385,7 @@ public final class Sprite extends Rasterizer2D { @Export("__t_507") public void __t_507(int var1, int var2, int var3, int var4) { if(var3 == 256) { - this.__a_505(var1, var2); + this.drawAt2(var1, var2); } else { var1 += this.yOffset; var2 += this.xOffset; diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/UnitPriceComparator.java index 8e047d794a..915d54d60f 100644 --- a/runescape-client/src/main/java/UnitPriceComparator.java +++ b/runescape-client/src/main/java/UnitPriceComparator.java @@ -198,7 +198,7 @@ final class UnitPriceComparator implements Comparator { if(Client.hintArrowType == 2) { WorldMapLabel.worldToScreen((Client.hintArrowX - class50.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - GraphicsObject.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); if(Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - Player.headIconHintSprites[0].__a_505(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + Player.headIconHintSprites[0].drawAt2(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 3220722c25..b472fef687 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -35,8 +35,8 @@ public final class WallDecoration { @ObfuscatedGetter( intValue = -303827911 ) - @Export("int7") - int int7; + @Export("orientation2") + int orientation2; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1927462659 diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 8a74c8b56c..2d3c2657bc 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -131,26 +131,26 @@ public class WorldMap { @ObfuscatedGetter( intValue = -1469654441 ) - @Export("__aq") - int __aq; + @Export("worldMapDisplayWidth") + int worldMapDisplayWidth; @ObfuscatedName("aj") @ObfuscatedGetter( intValue = -1140942239 ) - @Export("__aj") - int __aj; + @Export("worldMapDisplayHeight") + int worldMapDisplayHeight; @ObfuscatedName("av") @ObfuscatedGetter( intValue = -1301477687 ) - @Export("__av") - int __av; + @Export("worldMapDisplayX") + int worldMapDisplayX; @ObfuscatedName("ar") @ObfuscatedGetter( intValue = -298919797 ) - @Export("__ar") - int __ar; + @Export("worldMapDisplaY") + int worldMapDisplaY; @ObfuscatedName("ac") @ObfuscatedGetter( intValue = -1653084915 @@ -308,10 +308,10 @@ public class WorldMap { public WorldMap() { this.worldMapTargetX = -1; this.worldMapTargetY = -1; - this.__aq = -1; - this.__aj = -1; - this.__av = -1; - this.__ar = -1; + this.worldMapDisplayWidth = -1; + this.worldMapDisplayHeight = -1; + this.worldMapDisplayX = -1; + this.worldMapDisplaY = -1; this.__ac = 3; this.__ay = 50; this.perpetualFlash0 = false; @@ -472,8 +472,8 @@ public class WorldMap { @Export("__o_520") void __o_520(int var1, int var2, boolean var3, long var4) { if(this.currentMapArea0 != null) { - int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.__av) - (float)this.__ap_537() * this.zoom / 2.0F) / this.zoom); - int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.__ar) - (float)this.__as_538() * this.zoom / 2.0F) / this.zoom); + int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.__ap_537() * this.zoom / 2.0F) / this.zoom); + int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplaY) - (float)this.__as_538() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea0.coord(var6 + this.currentMapArea0.minX() * 64, var7 + this.currentMapArea0.minY() * 64); if(this.mouseCoord != null && var3) { int var9; @@ -805,10 +805,10 @@ public class WorldMap { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } - this.__aq = var8; - this.__aj = var9; - this.__av = var1; - this.__ar = var2; + this.worldMapDisplayWidth = var8; + this.worldMapDisplayHeight = var9; + this.worldMapDisplayX = var1; + this.worldMapDisplaY = var2; Rasterizer2D.Rasterizer2D_setClipArray(var6); } } @@ -1069,7 +1069,7 @@ public class WorldMap { ) @Export("__ap_537") public int __ap_537() { - return this.__aq; + return this.worldMapDisplayWidth; } @ObfuscatedName("as") @@ -1079,7 +1079,7 @@ public class WorldMap { ) @Export("__as_538") public int __as_538() { - return this.__aj; + return this.worldMapDisplayHeight; } @ObfuscatedName("am") diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 817482722f..161d5fa665 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -811,7 +811,7 @@ public class WorldMapRegion { void __av_50(WorldMapElement var1, int var2, int var3, int var4, int var5) { Sprite var6 = var1.getSprite(false); if(var6 != null) { - var6.__a_505(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); + var6.drawAt2(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); if(var4 % var5 < var5 / 2) { Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); @@ -843,7 +843,7 @@ public class WorldMapRegion { if(var4 != null) { int var5 = this.method473(var4, var1.field3287); int var6 = this.method474(var4, var1.field3301); - var4.__a_505(var5 + var2, var3 + var6); + var4.drawAt2(var5 + var2, var3 + var6); } } diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java index 02d0ac741e..c4c22c4f78 100644 --- a/runescape-client/src/main/java/class226.java +++ b/runescape-client/src/main/java/class226.java @@ -95,7 +95,7 @@ public class class226 { Rasterizer3D.method2989(16, 16); Rasterizer3D.__et_w = false; if(var9.placeholderTemplate != -1) { - var20.__a_505(0, 0); + var20.drawAt2(0, 0); } int var16 = var9.zoom2d; @@ -110,7 +110,7 @@ public class class226 { var19.calculateBoundsCylinder(); var19.__c_234(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); if(var9.notedId != -1) { - var20.__a_505(0, 0); + var20.drawAt2(0, 0); } if(var2 >= 1) { @@ -127,7 +127,7 @@ public class class226 { Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); if(var9.noteTemplate != -1) { - var20.__a_505(0, 0); + var20.drawAt2(0, 0); } if(var4 == 1 || var4 == 2 && var9.isStackable == 1) { diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index 9e05f0cb77..d9e1f40ec8 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -266,9 +266,9 @@ public class class39 extends class21 { Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var23 + var21); var14.__h_508(var22, var23, var17); } else { - var76.__a_505(var22, var23); + var76.drawAt2(var22, var23); Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23); - var14.__a_505(var22, var23); + var14.drawAt2(var22, var23); } Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); @@ -304,12 +304,12 @@ public class class39 extends class21 { if(Client.viewportTempX > -1) { if(var10.headIconPk != -1) { var87 += 25; - class15.headIconPkSprites[var10.headIconPk].__a_505(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + class15.headIconPkSprites[var10.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); } if(var10.headIconPrayer != -1) { var87 += 25; - ClientPreferences.headIconPrayerSprites[var10.headIconPrayer].__a_505(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + ClientPreferences.headIconPrayerSprites[var10.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); } } } @@ -318,7 +318,7 @@ public class class39 extends class21 { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); if(Client.viewportTempX > -1) { var87 += Player.headIconHintSprites[1].subHeight; - Player.headIconHintSprites[1].__a_505(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); } } } else { @@ -330,14 +330,14 @@ public class class39 extends class21 { if(var90.headIconPrayer >= 0 && var90.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); if(Client.viewportTempX > -1) { - ClientPreferences.headIconPrayerSprites[var90.headIconPrayer].__a_505(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); + ClientPreferences.headIconPrayerSprites[var90.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); } } if(Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); if(Client.viewportTempX > -1) { - Player.headIconHintSprites[0].__a_505(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + Player.headIconHintSprites[0].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); } } } @@ -714,41 +714,41 @@ public class class39 extends class21 { } } else { if(var82 != null) { - var82.__a_505(var52 + var65 - var26, var66); + var82.drawAt2(var52 + var65 - var26, var66); } if(var84 != null) { - var84.__a_505(var65 + var53 - var28, var66); + var84.drawAt2(var65 + var53 - var28, var66); } if(var83 != null) { for(var74 = 0; var74 < var49; ++var74) { - var83.__a_505(var23 * var74 + (var54 + var65 - var27), var66); + var83.drawAt2(var23 * var74 + (var54 + var65 - var27), var66); } } if(var85 != null) { - var85.__a_505(var56 + var65 - var29, var66); + var85.drawAt2(var56 + var65 - var29, var66); } var86.draw(var45, var55 + var65, var69, var95.__n | -16777216, 0); if(var81 != null) { if(var30 != null) { - var30.__a_505(var65 + var57 - var38, var66); + var30.drawAt2(var65 + var57 - var38, var66); } if(var32 != null) { - var32.__a_505(var58 + var65 - var40, var66); + var32.drawAt2(var58 + var65 - var40, var66); } if(var31 != null) { for(var74 = 0; var74 < var50; ++var74) { - var31.__a_505(var74 * var35 + (var65 + var59 - var39), var66); + var31.drawAt2(var74 * var35 + (var65 + var59 - var39), var66); } } if(var33 != null) { - var33.__a_505(var60 + var65 - var41, var66); + var33.drawAt2(var60 + var65 - var41, var66); } var44.draw(var46, var61 + var65, var72, var81.__n | -16777216, 0);