From abbfd5c047c0ebccbedcd1a9194d3283d7162745 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Wed, 6 Jul 2022 16:41:41 -0400 Subject: [PATCH] Renamed some If1 variables in Component --- client/src/main/java/rt4/Component.java | 280 +++++++++--------- client/src/main/java/rt4/Cs1ScriptRunner.java | 50 ++-- client/src/main/java/rt4/InterfaceList.java | 30 +- client/src/main/java/rt4/MiniMap.java | 4 +- client/src/main/java/rt4/MiniMenu.java | 36 +-- client/src/main/java/rt4/Protocol.java | 6 +- client/src/main/java/rt4/ScriptRunner.java | 12 +- client/src/main/java/rt4/client.java | 6 +- 8 files changed, 214 insertions(+), 210 deletions(-) diff --git a/client/src/main/java/rt4/Component.java b/client/src/main/java/rt4/Component.java index a0be38d..263a8bc 100644 --- a/client/src/main/java/rt4/Component.java +++ b/client/src/main/java/rt4/Component.java @@ -10,12 +10,16 @@ public final class Component { @OriginalMember(owner = "client!pf", name = "b", descriptor = "Lclient!n;") public static final SoftLruHashTable sprites = new SoftLruHashTable(200); + @OriginalMember(owner = "client!jk", name = "z", descriptor = "Lclient!n;") public static final SoftLruHashTable models = new SoftLruHashTable(50); + @OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;") public static final SoftLruHashTable fonts = new SoftLruHashTable(20); + @OriginalMember(owner = "client!rc", name = "C", descriptor = "Z") public static boolean aBoolean72 = false; + @OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;") public Object[] onFriendTransmit; @@ -38,7 +42,7 @@ public final class Component { public JagString[] ops; @OriginalMember(owner = "client!be", name = "s", descriptor = "[Lclient!na;") - public JagString[] aClass100Array19; + public JagString[] invOptions; @OriginalMember(owner = "client!be", name = "t", descriptor = "[Ljava/lang/Object;") public Object[] onInvTransmit; @@ -65,7 +69,7 @@ public final class Component { public int type; @OriginalMember(owner = "client!be", name = "V", descriptor = "[I") - public int[] anIntArray36; + public int[] invSprite; @OriginalMember(owner = "client!be", name = "X", descriptor = "Z") public boolean hFlip; @@ -131,7 +135,7 @@ public final class Component { public Object[] onTimer; @OriginalMember(owner = "client!be", name = "yc", descriptor = "[I") - public int[] anIntArray41; + public int[] invOffsetX; @OriginalMember(owner = "client!be", name = "Ac", descriptor = "[I") public int[] statTriggers; @@ -164,7 +168,7 @@ public final class Component { public int[] anIntArray46; @OriginalMember(owner = "client!be", name = "cd", descriptor = "[I") - public int[] anIntArray47; + public int[] invOffsetY; @OriginalMember(owner = "client!be", name = "gd", descriptor = "[Ljava/lang/Object;") public Object[] onUseWith; @@ -197,7 +201,7 @@ public final class Component { public int height = 0; @OriginalMember(owner = "client!be", name = "S", descriptor = "I") - public int anInt460 = 0; + public int halign = 0; @OriginalMember(owner = "client!be", name = "j", descriptor = "I") public int modelZoom = 100; @@ -212,7 +216,7 @@ public final class Component { public int dragDeadzone = 0; @OriginalMember(owner = "client!be", name = "W", descriptor = "I") - public int anInt462 = -1; + public int activeModelSeqId = -1; @OriginalMember(owner = "client!be", name = "o", descriptor = "S") public short aShort10 = 3000; @@ -257,9 +261,9 @@ public final class Component { public boolean aBoolean24 = false; @OriginalMember(owner = "client!ob", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_800 = JagString.parse(""); + public static final JagString EMPTY_STRING = JagString.parse(""); @OriginalMember(owner = "client!be", name = "Sb", descriptor = "Lclient!na;") - public JagString aClass100_85 = aClass100_800; + public JagString optionSuffix = EMPTY_STRING; @OriginalMember(owner = "client!be", name = "i", descriptor = "Z") public boolean aBoolean19 = false; @@ -286,7 +290,7 @@ public final class Component { public boolean dragRenderBehavior = false; @OriginalMember(owner = "client!be", name = "ob", descriptor = "Z") - public boolean textAntiMacro = false; + public boolean shadowed = false; @OriginalMember(owner = "client!be", name = "cb", descriptor = "I") public int rectangleLoop = -1; @@ -295,7 +299,7 @@ public final class Component { public int anInt496 = 1; @OriginalMember(owner = "client!be", name = "Cb", descriptor = "I") - public int anInt480 = 0; + public int overColor = 0; @OriginalMember(owner = "client!be", name = "Hb", descriptor = "Z") public boolean if3 = false; @@ -307,10 +311,10 @@ public final class Component { public ServerActiveProperties properties = DEFAULT_SERVER_ACTIVE_PROPERTIES; @OriginalMember(owner = "client!be", name = "cc", descriptor = "I") - public int anInt492 = 0; + public int activeColor = 0; @OriginalMember(owner = "client!be", name = "Gb", descriptor = "Lclient!na;") - public JagString text = aClass100_800; + public JagString text = EMPTY_STRING; @OriginalMember(owner = "client!be", name = "n", descriptor = "I") public int width = 0; @@ -322,10 +326,10 @@ public final class Component { public boolean noClickThrough = false; @OriginalMember(owner = "client!be", name = "U", descriptor = "I") - private int anInt461 = -1; + private int activeModelId = -1; @OriginalMember(owner = "client!be", name = "N", descriptor = "I") - public int layer = -1; + public int overlayer = -1; @OriginalMember(owner = "client!be", name = "pb", descriptor = "I") public int aspectWidth = 1; @@ -340,7 +344,7 @@ public final class Component { public int modelZOffset = 0; @OriginalMember(owner = "client!be", name = "Dc", descriptor = "Lclient!na;") - public JagString optionBase = aClass100_800; + public JagString optionBase = EMPTY_STRING; @OriginalMember(owner = "client!be", name = "Lc", descriptor = "I") public int updatedVarcsReaderIndex = 0; @@ -349,7 +353,7 @@ public final class Component { public int baseWidth = 0; @OriginalMember(owner = "client!be", name = "Mc", descriptor = "I") - public int anInt512 = 0; + public int invMarginX = 0; @OriginalMember(owner = "client!be", name = "Ib", descriptor = "I") public int lastTransmitTimer = -1; @@ -367,13 +371,13 @@ public final class Component { public int modelXOffset = 0; @OriginalMember(owner = "client!be", name = "Ub", descriptor = "Lclient!na;") - public JagString targetVerb = aClass100_800; + public JagString optionCircumfix = EMPTY_STRING; @OriginalMember(owner = "client!be", name = "Lb", descriptor = "I") public int modelRotationSpeed = 0; @OriginalMember(owner = "client!be", name = "r", descriptor = "Lclient!na;") - public JagString aClass100_82 = aClass100_800; + public JagString activeText = EMPTY_STRING; @OriginalMember(owner = "client!be", name = "Pc", descriptor = "I") public int outlineThickness = 0; @@ -388,7 +392,7 @@ public final class Component { public int anInt495 = 0; @OriginalMember(owner = "client!be", name = "Sc", descriptor = "I") - public int anInt516 = 0; + public int invMarginY = 0; @OriginalMember(owner = "client!be", name = "Tb", descriptor = "I") public int baseHeight = 0; @@ -397,7 +401,7 @@ public final class Component { public int id = -1; @OriginalMember(owner = "client!be", name = "Yc", descriptor = "I") - public int anInt519 = -1; + public int activeSpriteId = -1; @OriginalMember(owner = "client!be", name = "zc", descriptor = "B") public byte yMode = 0; @@ -424,7 +428,7 @@ public final class Component { public int modelSeqId = -1; @OriginalMember(owner = "client!be", name = "Rc", descriptor = "Lclient!na;") - public JagString aClass100_89 = LocalizedText.OK; + public JagString option = LocalizedText.OK; @OriginalMember(owner = "client!be", name = "Gc", descriptor = "I") public int modelYOffset = 0; @@ -490,7 +494,7 @@ public final class Component { public int color = 0; @OriginalMember(owner = "client!be", name = "xd", descriptor = "I") - public int anInt530 = 0; + public int buttonType = 0; @OriginalMember(owner = "client!ec", name = "a", descriptor = "(II)V") public static void clean() { @@ -580,51 +584,51 @@ public final class Component { } @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!wa;)V") - public final void decodeNoScripts(@OriginalArg(1) Buffer arg0) { + public final void decodeIf1(@OriginalArg(1) Buffer buffer) { this.if3 = false; - this.type = arg0.g1(); - this.anInt530 = arg0.g1(); - this.clientCode = arg0.g2(); - this.baseX = arg0.g2b(); - this.baseY = arg0.g2b(); - this.baseWidth = arg0.g2(); - this.baseHeight = arg0.g2(); + this.type = buffer.g1(); + this.buttonType = buffer.g1(); + this.clientCode = buffer.g2(); + this.baseX = buffer.g2b(); + this.baseY = buffer.g2b(); + this.baseWidth = buffer.g2(); + this.baseHeight = buffer.g2(); this.dynamicWidthValue = 0; this.dynamicHeightValue = 0; this.yMode = 0; this.xMode = 0; - this.alpha = arg0.g1(); - this.layer = arg0.g2(); - if (this.layer == 65535) { - this.layer = -1; + this.alpha = buffer.g1(); + this.overlayer = buffer.g2(); + if (this.overlayer == 65535) { + this.overlayer = -1; } else { - this.layer += this.id & 0xFFFF0000; + this.overlayer += this.id & 0xFFFF0000; } - this.anInt470 = arg0.g2(); + this.anInt470 = buffer.g2(); if (this.anInt470 == 65535) { this.anInt470 = -1; } - @Pc(109) int local109 = arg0.g1(); + @Pc(109) int local109 = buffer.g1(); @Pc(125) int local125; if (local109 > 0) { this.cs1ComparisonOperands = new int[local109]; this.cs1ComparisonOpcodes = new int[local109]; for (local125 = 0; local125 < local109; local125++) { - this.cs1ComparisonOpcodes[local125] = arg0.g1(); - this.cs1ComparisonOperands[local125] = arg0.g2(); + this.cs1ComparisonOpcodes[local125] = buffer.g1(); + this.cs1ComparisonOperands[local125] = buffer.g2(); } } - local125 = arg0.g1(); + local125 = buffer.g1(); @Pc(164) int local164; @Pc(175) int local175; @Pc(183) int local183; if (local125 > 0) { this.cs1Scripts = new int[local125][]; for (local164 = 0; local164 < local125; local164++) { - local175 = arg0.g2(); + local175 = buffer.g2(); this.cs1Scripts[local164] = new int[local175]; for (local183 = 0; local183 < local175; local183++) { - this.cs1Scripts[local164][local183] = arg0.g2(); + this.cs1Scripts[local164][local183] = buffer.g2(); if (this.cs1Scripts[local164][local183] == 65535) { this.cs1Scripts[local164][local183] = -1; } @@ -632,12 +636,12 @@ public final class Component { } } if (this.type == 0) { - this.scrollMaxV = arg0.g2(); - this.hidden = arg0.g1() == 1; + this.scrollMaxV = buffer.g2(); + this.hidden = buffer.g1() == 1; } if (this.type == 1) { - arg0.g2(); - arg0.g1(); + buffer.g2(); + buffer.g1(); } local164 = 0; if (this.type == 2) { @@ -645,156 +649,156 @@ public final class Component { this.objCounts = new int[this.baseWidth * this.baseHeight]; this.objTypes = new int[this.baseHeight * this.baseWidth]; this.dynamicWidthValue = 3; - local175 = arg0.g1(); - local183 = arg0.g1(); + local175 = buffer.g1(); + local183 = buffer.g1(); if (local175 == 1) { local164 = 268435456; } - @Pc(312) int local312 = arg0.g1(); + @Pc(312) int local312 = buffer.g1(); if (local183 == 1) { local164 |= 0x40000000; } if (local312 == 1) { local164 |= Integer.MIN_VALUE; } - @Pc(333) int local333 = arg0.g1(); + @Pc(333) int local333 = buffer.g1(); if (local333 == 1) { local164 |= 0x20000000; } - this.anInt512 = arg0.g1(); - this.anInt516 = arg0.g1(); - this.anIntArray47 = new int[20]; - this.anIntArray41 = new int[20]; - this.anIntArray36 = new int[20]; - @Pc(364) int local364; - for (local364 = 0; local364 < 20; local364++) { - @Pc(371) int local371 = arg0.g1(); - if (local371 == 1) { - this.anIntArray41[local364] = arg0.g2b(); - this.anIntArray47[local364] = arg0.g2b(); - this.anIntArray36[local364] = arg0.g4(); + this.invMarginX = buffer.g1(); + this.invMarginY = buffer.g1(); + this.invOffsetY = new int[20]; + this.invOffsetX = new int[20]; + this.invSprite = new int[20]; + @Pc(364) int i; + for (i = 0; i < 20; i++) { + @Pc(371) int hasSprite = buffer.g1(); + if (hasSprite == 1) { + this.invOffsetX[i] = buffer.g2b(); + this.invOffsetY[i] = buffer.g2b(); + this.invSprite[i] = buffer.g4(); } else { - this.anIntArray36[local364] = -1; + this.invSprite[i] = -1; } } - this.aClass100Array19 = new JagString[5]; - for (local364 = 0; local364 < 5; local364++) { - @Pc(418) JagString local418 = arg0.gjstr(); - if (local418.length() > 0) { - this.aClass100Array19[local364] = local418; - local164 |= 0x1 << local364 + 23; + this.invOptions = new JagString[5]; + for (i = 0; i < 5; i++) { + @Pc(418) JagString option = buffer.gjstr(); + if (option.length() > 0) { + this.invOptions[i] = option; + local164 |= 0x1 << i + 23; } } } if (this.type == 3) { - this.filled = arg0.g1() == 1; + this.filled = buffer.g1() == 1; } if (this.type == 4 || this.type == 1) { - this.anInt460 = arg0.g1(); - this.anInt478 = arg0.g1(); - this.anInt467 = arg0.g1(); - this.font = arg0.g2(); + this.halign = buffer.g1(); + this.anInt478 = buffer.g1(); + this.anInt467 = buffer.g1(); + this.font = buffer.g2(); if (this.font == 65535) { this.font = -1; } - this.textAntiMacro = arg0.g1() == 1; + this.shadowed = buffer.g1() == 1; } if (this.type == 4) { - this.text = arg0.gjstr(); - this.aClass100_82 = arg0.gjstr(); + this.text = buffer.gjstr(); + this.activeText = buffer.gjstr(); } if (this.type == 1 || this.type == 3 || this.type == 4) { - this.color = arg0.g4(); + this.color = buffer.g4(); } if (this.type == 3 || this.type == 4) { - this.anInt492 = arg0.g4(); - this.anInt480 = arg0.g4(); - this.anInt475 = arg0.g4(); + this.activeColor = buffer.g4(); + this.overColor = buffer.g4(); + this.anInt475 = buffer.g4(); } if (this.type == 5) { - this.spriteId = arg0.g4(); - this.anInt519 = arg0.g4(); + this.spriteId = buffer.g4(); + this.activeSpriteId = buffer.g4(); } if (this.type == 6) { this.modelType = 1; - this.modelId = arg0.g2(); + this.modelId = buffer.g2(); this.anInt518 = 1; if (this.modelId == 65535) { this.modelId = -1; } - this.anInt461 = arg0.g2(); - if (this.anInt461 == 65535) { - this.anInt461 = -1; + this.activeModelId = buffer.g2(); + if (this.activeModelId == 65535) { + this.activeModelId = -1; } - this.modelSeqId = arg0.g2(); + this.modelSeqId = buffer.g2(); if (this.modelSeqId == 65535) { this.modelSeqId = -1; } - this.anInt462 = arg0.g2(); - if (this.anInt462 == 65535) { - this.anInt462 = -1; + this.activeModelSeqId = buffer.g2(); + if (this.activeModelSeqId == 65535) { + this.activeModelSeqId = -1; } - this.modelZoom = arg0.g2(); - this.modelXAngle = arg0.g2(); - this.modelYAngle = arg0.g2(); + this.modelZoom = buffer.g2(); + this.modelXAngle = buffer.g2(); + this.modelYAngle = buffer.g2(); } if (this.type == 7) { this.dynamicHeightValue = 3; this.dynamicWidthValue = 3; this.objCounts = new int[this.baseHeight * this.baseWidth]; this.objTypes = new int[this.baseWidth * this.baseHeight]; - this.anInt460 = arg0.g1(); - this.font = arg0.g2(); + this.halign = buffer.g1(); + this.font = buffer.g2(); if (this.font == 65535) { this.font = -1; } - this.textAntiMacro = arg0.g1() == 1; - this.color = arg0.g4(); - this.anInt512 = arg0.g2b(); - this.anInt516 = arg0.g2b(); - local175 = arg0.g1(); - if (local175 == 1) { + this.shadowed = buffer.g1() == 1; + this.color = buffer.g4(); + this.invMarginX = buffer.g2b(); + this.invMarginY = buffer.g2b(); + int invHasOptions = buffer.g1(); + if (invHasOptions == 1) { local164 |= 0x40000000; } - this.aClass100Array19 = new JagString[5]; - for (local183 = 0; local183 < 5; local183++) { - @Pc(756) JagString local756 = arg0.gjstr(); - if (local756.length() > 0) { - this.aClass100Array19[local183] = local756; - local164 |= 0x1 << local183 + 23; + this.invOptions = new JagString[5]; + for (int i = 0; i < 5; i++) { + @Pc(756) JagString option = buffer.gjstr(); + if (option.length() > 0) { + this.invOptions[i] = option; + local164 |= 0x1 << i + 23; } } } if (this.type == 8) { - this.text = arg0.gjstr(); + this.text = buffer.gjstr(); } - if (this.anInt530 == 2 || this.type == 2) { - this.targetVerb = arg0.gjstr(); - this.aClass100_85 = arg0.gjstr(); - local175 = arg0.g2() & 0x3F; + if (this.buttonType == 2 || this.type == 2) { + this.optionCircumfix = buffer.gjstr(); + this.optionSuffix = buffer.gjstr(); + local175 = buffer.g2() & 0x3F; local164 |= local175 << 11; } - if (this.anInt530 == 1 || this.anInt530 == 4 || this.anInt530 == 5 || this.anInt530 == 6) { - this.aClass100_89 = arg0.gjstr(); - if (this.aClass100_89.length() == 0) { - if (this.anInt530 == 1) { - this.aClass100_89 = LocalizedText.OK; + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { + this.option = buffer.gjstr(); + if (this.option.length() == 0) { + if (this.buttonType == 1) { + this.option = LocalizedText.OK; } - if (this.anInt530 == 4) { - this.aClass100_89 = LocalizedText.SELECT; + if (this.buttonType == 4) { + this.option = LocalizedText.SELECT; } - if (this.anInt530 == 5) { - this.aClass100_89 = LocalizedText.SELECT; + if (this.buttonType == 5) { + this.option = LocalizedText.SELECT; } - if (this.anInt530 == 6) { - this.aClass100_89 = LocalizedText.CONTINUE; + if (this.buttonType == 6) { + this.option = LocalizedText.CONTINUE; } } } - if (this.anInt530 == 1 || this.anInt530 == 4 || this.anInt530 == 5) { + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { local164 |= 0x400000; } - if (this.anInt530 == 6) { + if (this.buttonType == 6) { local164 |= 0x1; } this.properties = new ServerActiveProperties(local164, -1); @@ -803,10 +807,10 @@ public final class Component { @OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;") public final Sprite method482(@OriginalArg(1) int arg0) { aBoolean72 = false; - if (arg0 < 0 || arg0 >= this.anIntArray36.length) { + if (arg0 < 0 || arg0 >= this.invSprite.length) { return null; } - @Pc(29) int local29 = this.anIntArray36[arg0]; + @Pc(29) int local29 = this.invSprite[arg0]; if (local29 == -1) { return null; } @@ -873,7 +877,7 @@ public final class Component { @Pc(13) int local13; if (arg4) { local10 = this.anInt518; - local13 = this.anInt461; + local13 = this.activeModelId; } else { local13 = this.modelId; local10 = this.modelType; @@ -959,7 +963,7 @@ public final class Component { aBoolean72 = false; @Pc(12) int local12; if (arg0) { - local12 = this.anInt519; + local12 = this.activeSpriteId; } else { local12 = this.spriteId; } @@ -1011,7 +1015,7 @@ public final class Component { } @OriginalMember(owner = "client!be", name = "c", descriptor = "(ILclient!wa;)V") - public final void decodeScriptFormat(@OriginalArg(1) Buffer buffer) { + public final void decodeIf3(@OriginalArg(1) Buffer buffer) { this.if3 = true; buffer.offset++; this.type = buffer.g1(); @@ -1028,11 +1032,11 @@ public final class Component { this.dynamicHeightValue = buffer.g1b(); this.yMode = buffer.g1b(); this.xMode = buffer.g1b(); - this.layer = buffer.g2(); - if (this.layer == 65535) { - this.layer = -1; + this.overlayer = buffer.g2(); + if (this.overlayer == 65535) { + this.overlayer = -1; } else { - this.layer = (this.id & 0xFFFF0000) + this.layer; + this.overlayer = (this.id & 0xFFFF0000) + this.overlayer; } this.hidden = buffer.g1() == 1; if (this.type == 0) { @@ -1087,9 +1091,9 @@ public final class Component { } this.text = buffer.gjstr(); this.anInt467 = buffer.g1(); - this.anInt460 = buffer.g1(); + this.halign = buffer.g1(); this.anInt478 = buffer.g1(); - this.textAntiMacro = buffer.g1() == 1; + this.shadowed = buffer.g1() == 1; this.color = buffer.g4(); } if (this.type == 3) { @@ -1150,7 +1154,7 @@ public final class Component { this.dragDeadtime = buffer.g1(); this.dragRenderBehavior = buffer.g1() == 1; local567 = -1; - this.targetVerb = buffer.gjstr(); + this.optionCircumfix = buffer.gjstr(); if (ServerActiveProperties.getTargetMask(local175) != 0) { local567 = buffer.g2(); this.anInt499 = buffer.g2(); diff --git a/client/src/main/java/rt4/Cs1ScriptRunner.java b/client/src/main/java/rt4/Cs1ScriptRunner.java index 1532083..d8a64f6 100644 --- a/client/src/main/java/rt4/Cs1ScriptRunner.java +++ b/client/src/main/java/rt4/Cs1ScriptRunner.java @@ -313,7 +313,7 @@ public class Cs1ScriptRunner { for (@Pc(18) int i = 0; i < components.length; i++) { @Pc(30) Component component = components[i]; - if (component != null && (component.layer == layer || layer == 0xabcdabcd && component == aClass13_14)) { + if (component != null && (component.overlayer == layer || layer == 0xabcdabcd && component == aClass13_14)) { @Pc(57) int rectangle; if (parentRectangle == -1) { InterfaceList.rectangleX[InterfaceList.rectangles] = arg2 + component.x; @@ -603,11 +603,11 @@ public class Cs1ScriptRunner { local270 = 0; for (local276 = 0; local276 < component.baseHeight; local276++) { for (local468 = 0; local468 < component.baseWidth; local468++) { - int y = local114 + local276 * (component.anInt516 + 32); - int x = (component.anInt512 + 32) * local468 + local123; + int y = local114 + local276 * (component.invMarginY + 32); + int x = (component.invMarginX + 32) * local468 + local123; if (local270 < 20) { - y += component.anIntArray47[local270]; - x += component.anIntArray41[local270]; + y += component.invOffsetY[local270]; + x += component.invOffsetX[local270]; } if (component.objTypes[local270] > 0) { objId = component.objTypes[local270] - 1; @@ -698,7 +698,7 @@ public class Cs1ScriptRunner { // sprite.renderResized(x, y, 36, 32); } } - } else if (component.anIntArray36 != null && local270 < 20) { + } else if (component.invSprite != null && local270 < 20) { @Pc(1381) Sprite local1381 = component.method482(local270); if (local1381 != null) { local1381.render(x, y); @@ -712,14 +712,14 @@ public class Cs1ScriptRunner { } } else if (component.type == 3) { if (isTrue(component)) { - local270 = component.anInt492; + local270 = component.activeColor; if (InterfaceList.aClass13_22 == component && component.anInt475 != 0) { local270 = component.anInt475; } } else { local270 = component.color; - if (component == InterfaceList.aClass13_22 && component.anInt480 != 0) { - local270 = component.anInt480; + if (component == InterfaceList.aClass13_22 && component.overColor != 0) { + local270 = component.overColor; } } if (alpha == 0) { @@ -752,17 +752,17 @@ public class Cs1ScriptRunner { if (local1921 != null) { @Pc(1934) JagString local1934 = component.text; if (isTrue(component)) { - local276 = component.anInt492; + local276 = component.activeColor; if (InterfaceList.aClass13_22 == component && component.anInt475 != 0) { local276 = component.anInt475; } - if (component.aClass100_82.length() > 0) { - local1934 = component.aClass100_82; + if (component.activeText.length() > 0) { + local1934 = component.activeText; } } else { local276 = component.color; - if (InterfaceList.aClass13_22 == component && component.anInt480 != 0) { - local276 = component.anInt480; + if (InterfaceList.aClass13_22 == component && component.overColor != 0) { + local276 = component.overColor; } } if (component.if3 && component.objId != -1) { @@ -782,7 +782,7 @@ public class Cs1ScriptRunner { if (!component.if3) { local1934 = interpolate(component, local1934); } - local1921.drawInterfaceText(local1934, local123, local114, component.width, component.height, local276, component.textAntiMacro ? 0 : -1, component.anInt460, component.anInt478, component.anInt467); + local1921.drawInterfaceText(local1934, local123, local114, component.width, component.height, local276, component.shadowed ? 0 : -1, component.halign, component.anInt478, component.anInt467); } else if (Component.aBoolean72) { InterfaceList.redraw(component); } @@ -890,7 +890,7 @@ public class Cs1ScriptRunner { @Pc(2587) boolean local2587 = isTrue(component); @Pc(2589) Model local2589 = null; if (local2587) { - local276 = component.anInt462; + local276 = component.activeModelSeqId; } else { local276 = component.modelSeqId; } @@ -1010,14 +1010,14 @@ public class Cs1ScriptRunner { } else { local3159 = JagString.concatenate(new JagString[]{MiniMenu.aClass100_32, local2611.name, aClass100_375, method1548(component.objCounts[local276])}); } - local556 = local123 + memory * (component.anInt512 + 115); - objId = (component.anInt516 + 12) * local468 + local114; - if (component.anInt460 == 0) { - local1921.renderLeft(local3159, local556, objId, component.color, component.textAntiMacro ? 0 : -1); - } else if (component.anInt460 == 1) { - local1921.renderCenter(local3159, local556 + 57, objId, component.color, component.textAntiMacro ? 0 : -1); + local556 = local123 + memory * (component.invMarginX + 115); + objId = (component.invMarginY + 12) * local468 + local114; + if (component.halign == 0) { + local1921.renderLeft(local3159, local556, objId, component.color, component.shadowed ? 0 : -1); + } else if (component.halign == 1) { + local1921.renderCenter(local3159, local556 + 57, objId, component.color, component.shadowed ? 0 : -1); } else { - local1921.renderRight(local3159, local556 + 115 - 1, objId, component.color, component.textAntiMacro ? 0 : -1); + local1921.renderRight(local3159, local556 + 115 - 1, objId, component.color, component.shadowed ? 0 : -1); } } local276++; @@ -1200,7 +1200,7 @@ public class Cs1ScriptRunner { if (local16 == 324) { if (anInt3851 == -1) { anInt3851 = arg0.spriteId; - anInt3502 = arg0.anInt519; + anInt3502 = arg0.activeSpriteId; } if (PlayerAppearance.DEFAULT.gender) { arg0.spriteId = anInt3851; @@ -1209,7 +1209,7 @@ public class Cs1ScriptRunner { } } else if (local16 == 325) { if (anInt3851 == -1) { - anInt3502 = arg0.anInt519; + anInt3502 = arg0.activeSpriteId; anInt3851 = arg0.spriteId; } if (PlayerAppearance.DEFAULT.gender) { diff --git a/client/src/main/java/rt4/InterfaceList.java b/client/src/main/java/rt4/InterfaceList.java index fda704b..6e48981 100644 --- a/client/src/main/java/rt4/InterfaceList.java +++ b/client/src/main/java/rt4/InterfaceList.java @@ -175,9 +175,9 @@ public class InterfaceList { @Pc(74) Component local74 = components[arg0][local46] = new Component(); local74.id = local46 + (arg0 << 16); if (local62[0] == -1) { - local74.decodeScriptFormat(new Buffer(local62)); + local74.decodeIf3(new Buffer(local62)); } else { - local74.decodeNoScripts(new Buffer(local62)); + local74.decodeIf1(new Buffer(local62)); } } } @@ -326,7 +326,7 @@ public class InterfaceList { public static void method4190(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Component[] arg4) { for (@Pc(3) int local3 = 0; local3 < arg4.length; local3++) { @Pc(19) Component local19 = arg4[local3]; - if (local19 != null && local19.layer == arg0) { + if (local19 != null && local19.overlayer == arg0) { method2801(arg3, arg2, local19, arg1); method2291(local19, arg3, arg2); if (local19.scrollMaxH - local19.width < local19.scrollX) { @@ -476,9 +476,9 @@ public class InterfaceList { arg2.width = arg2.baseWidth * arg1 >> 14; } else if (arg2.dynamicWidthValue == 3) { if (arg2.type == 2) { - arg2.width = arg2.baseWidth * 32 + (arg2.baseWidth - 1) * arg2.anInt512; + arg2.width = arg2.baseWidth * 32 + (arg2.baseWidth - 1) * arg2.invMarginX; } else if (arg2.type == 7) { - arg2.width = arg2.baseWidth * 115 + arg2.anInt512 * (arg2.baseWidth - 1); + arg2.width = arg2.baseWidth * 115 + arg2.invMarginX * (arg2.baseWidth - 1); } } if (arg2.dynamicHeightValue == 0) { @@ -489,9 +489,9 @@ public class InterfaceList { arg2.height = arg0 * arg2.baseHeight >> 14; } else if (arg2.dynamicHeightValue == 3) { if (arg2.type == 2) { - arg2.height = (arg2.baseHeight - 1) * arg2.anInt516 + arg2.baseHeight * 32; + arg2.height = (arg2.baseHeight - 1) * arg2.invMarginY + arg2.baseHeight * 32; } else if (arg2.type == 7) { - arg2.height = arg2.baseHeight * 12 + (arg2.baseHeight - 1) * arg2.anInt516; + arg2.height = arg2.baseHeight * 12 + (arg2.baseHeight - 1) * arg2.invMarginY; } } if (arg2.dynamicWidthValue == 4) { @@ -526,8 +526,8 @@ public class InterfaceList { @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;") public static Component method4668(@OriginalArg(0) Component arg0) { - if (arg0.layer != -1) { - return getComponent(arg0.layer); + if (arg0.overlayer != -1) { + return getComponent(arg0.overlayer); } @Pc(28) int local28 = arg0.id >>> 16; @Pc(33) HashTableIterator local33 = new HashTableIterator(openInterfaces); @@ -612,7 +612,7 @@ public class InterfaceList { public static void method946(@OriginalArg(0) Component[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) { @Pc(9) Component component = arg0[local1]; - if (component != null && component.layer == arg1 && (!component.if3 || component.type == 0 || component.aBoolean25 || getServerActiveProperties(component).events != 0 || component == Cs1ScriptRunner.aClass13_1 || component.clientCode == 1338) && (!component.if3 || !method947(component))) { + if (component != null && component.overlayer == arg1 && (!component.if3 || component.type == 0 || component.aBoolean25 || getServerActiveProperties(component).events != 0 || component == Cs1ScriptRunner.aClass13_1 || component.clientCode == 1338) && (!component.if3 || !method947(component))) { @Pc(50) int local50 = component.x + arg6; @Pc(55) int local55 = component.y + arg7; @Pc(61) int local61; @@ -1024,7 +1024,7 @@ public class InterfaceList { } } if (!component.if3 && Cs1ScriptRunner.aClass13_14 == null && clickedInventoryComponent == null && !Cs1ScriptRunner.aBoolean108) { - if ((component.anInt470 >= 0 || component.anInt480 != 0) && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { + if ((component.anInt470 >= 0 || component.overColor != 0) && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { if (component.anInt470 >= 0) { aClass13_22 = arg0[component.anInt470]; } else { @@ -1151,7 +1151,7 @@ public class InterfaceList { return null; } for (@Pc(10) int local10 = 0; local10 < local4; local10++) { - arg0 = getComponent(arg0.layer); + arg0 = getComponent(arg0.overlayer); if (arg0 == null) { return null; } @@ -1221,7 +1221,7 @@ public class InterfaceList { public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) { for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) { @Pc(15) Component local15 = arg1[local7]; - if (local15 != null && local15.layer == arg0 && (!local15.if3 || !method947(local15))) { + if (local15 != null && local15.overlayer == arg0 && (!local15.if3 || !method947(local15))) { if (local15.type == 0) { if (!local15.if3 && method947(local15) && local15 != aClass13_22) { continue; @@ -1237,10 +1237,10 @@ public class InterfaceList { } if (local15.type == 6) { @Pc(105) int local105; - if (local15.modelSeqId != -1 || local15.anInt462 != -1) { + if (local15.modelSeqId != -1 || local15.activeModelSeqId != -1) { @Pc(100) boolean local100 = Cs1ScriptRunner.isTrue(local15); if (local100) { - local105 = local15.anInt462; + local105 = local15.activeModelSeqId; } else { local105 = local15.modelSeqId; } diff --git a/client/src/main/java/rt4/MiniMap.java b/client/src/main/java/rt4/MiniMap.java index 0e0efbb..30d2888 100644 --- a/client/src/main/java/rt4/MiniMap.java +++ b/client/src/main/java/rt4/MiniMap.java @@ -468,10 +468,10 @@ public class MiniMap { public static JagString getTargetVerb(@OriginalArg(0) Component arg0) { if (InterfaceList.getServerActiveProperties(arg0).getTargetMask() == 0) { return null; - } else if (arg0.targetVerb == null || arg0.targetVerb.trim().length() == 0) { + } else if (arg0.optionCircumfix == null || arg0.optionCircumfix.trim().length() == 0) { return Cheat.qaOpTest ? aClass100_668 : null; } else { - return arg0.targetVerb; + return arg0.optionCircumfix; } } diff --git a/client/src/main/java/rt4/MiniMenu.java b/client/src/main/java/rt4/MiniMenu.java index ccc1f7b..e0de2b3 100644 --- a/client/src/main/java/rt4/MiniMenu.java +++ b/client/src/main/java/rt4/MiniMenu.java @@ -140,27 +140,27 @@ public class MiniMenu { @OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V") public static void addComponentEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component component) { - if (component.anInt530 == 1) { - add(-1, 0L, JagString.EMPTY, 0, (short) 8, component.aClass100_89, component.id); + if (component.buttonType == 1) { + add(-1, 0L, JagString.EMPTY, 0, (short) 8, component.option, component.id); } @Pc(47) JagString local47; - if (component.anInt530 == 2 && !aBoolean302) { + if (component.buttonType == 2 && !aBoolean302) { local47 = MiniMap.getTargetVerb(component); if (local47 != null) { - add(-1, 0L, JagString.concatenate(new JagString[]{COLOR_GREEN, component.aClass100_85}), -1, (short) 32, local47, component.id); + add(-1, 0L, JagString.concatenate(new JagString[]{COLOR_GREEN, component.optionSuffix}), -1, (short) 32, local47, component.id); } } - if (component.anInt530 == 3) { + if (component.buttonType == 3) { add(-1, 0L, JagString.EMPTY, 0, (short) 28, LocalizedText.CLOSE, component.id); } - if (component.anInt530 == 4) { - add(-1, 0L, JagString.EMPTY, 0, (short) 59, component.aClass100_89, component.id); + if (component.buttonType == 4) { + add(-1, 0L, JagString.EMPTY, 0, (short) 59, component.option, component.id); } - if (component.anInt530 == 5) { - add(-1, 0L, JagString.EMPTY, 0, (short) 51, component.aClass100_89, component.id); + if (component.buttonType == 5) { + add(-1, 0L, JagString.EMPTY, 0, (short) 51, component.option, component.id); } - if (component.anInt530 == 6 && Cs1ScriptRunner.aClass13_10 == null) { - add(-1, 0L, JagString.EMPTY, -1, (short) 41, component.aClass100_89, component.id); + if (component.buttonType == 6 && Cs1ScriptRunner.aClass13_10 == null) { + add(-1, 0L, JagString.EMPTY, -1, (short) 41, component.option, component.id); } @Pc(173) int local173; @Pc(171) int local171; @@ -168,11 +168,11 @@ public class MiniMenu { local171 = 0; for (local173 = 0; local173 < component.baseHeight; local173++) { for (@Pc(183) int local183 = 0; local183 < component.baseWidth; local183++) { - @Pc(195) int local195 = (component.anInt512 + 32) * local183; - @Pc(202) int local202 = (component.anInt516 + 32) * local173; + @Pc(195) int local195 = (component.invMarginX + 32) * local183; + @Pc(202) int local202 = (component.invMarginY + 32) * local173; if (local171 < 20) { - local202 += component.anIntArray47[local171]; - local195 += component.anIntArray41[local171]; + local202 += component.invOffsetY[local171]; + local195 += component.invOffsetX[local171]; } if (arg1 >= local195 && local202 <= arg0 && local195 + 32 > arg1 && local202 + 32 > arg0) { InterfaceList.mouseOverInventoryInterface = component; @@ -228,7 +228,7 @@ public class MiniMenu { } } } - local296 = component.aClass100Array19; + local296 = component.invOptions; if (aBoolean237) { local296 = annotateOps(local296); } @@ -690,7 +690,7 @@ public class MiniMenu { if (local693.if3) { aClass100_466 = JagString.concatenate(new JagString[]{local693.optionBase, COLOR_WHITE}); } else { - aClass100_466 = JagString.concatenate(new JagString[]{COLOR_GREEN, local693.aClass100_85, COLOR_WHITE}); + aClass100_466 = JagString.concatenate(new JagString[]{COLOR_GREEN, local693.optionSuffix, COLOR_WHITE}); } } return; @@ -1568,7 +1568,7 @@ public class MiniMenu { if (local59 == null) { local59 = Fonts.b12Full; } - local59.method2878(local24, arg2, arg1, arg0.width, arg0.height, arg0.color, arg0.shadowColor, arg0.anInt460, arg0.anInt478, client.aRandom1, gregorianDateSeed, anIntArray132); + local59.method2878(local24, arg2, arg1, arg0.width, arg0.height, arg0.color, arg0.shadowColor, arg0.halign, arg0.anInt478, client.aRandom1, gregorianDateSeed, anIntArray132); InterfaceList.redrawScreen(anIntArray132[0], anIntArray132[2], anIntArray132[1], anIntArray132[3]); } diff --git a/client/src/main/java/rt4/Protocol.java b/client/src/main/java/rt4/Protocol.java index c0d9489..74a6d4d 100644 --- a/client/src/main/java/rt4/Protocol.java +++ b/client/src/main/java/rt4/Protocol.java @@ -2981,7 +2981,7 @@ public class Protocol { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = InterfaceList.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.overlayer); } while (priorityComponent == null || priorityComponent.createdComponents == null || prioritySource.createdComponentId >= priorityComponent.createdComponents.length || prioritySource != priorityComponent.createdComponents[prioritySource.createdComponentId]); ScriptRunner.run(priorityRequest); } @@ -2990,7 +2990,7 @@ public class Protocol { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = InterfaceList.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.overlayer); } while (priorityComponent == null || priorityComponent.createdComponents == null || priorityComponent.createdComponents.length <= prioritySource.createdComponentId || priorityComponent.createdComponents[prioritySource.createdComponentId] != prioritySource); ScriptRunner.run(priorityRequest); } @@ -2999,7 +2999,7 @@ public class Protocol { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = InterfaceList.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.overlayer); } while (priorityComponent == null || priorityComponent.createdComponents == null || prioritySource.createdComponentId >= priorityComponent.createdComponents.length || priorityComponent.createdComponents[prioritySource.createdComponentId] != prioritySource); ScriptRunner.run(priorityRequest); } diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java index b4d96f9..e7615f5 100644 --- a/client/src/main/java/rt4/ScriptRunner.java +++ b/client/src/main/java/rt4/ScriptRunner.java @@ -2145,7 +2145,7 @@ public final class ScriptRunner { @Pc(1137) Component local1137 = new Component(); local1137.if3 = true; local1137.createdComponentId = int2; - local1137.layer = local1137.id = local1063.id; + local1137.overlayer = local1137.id = local1063.id; local1137.type = int3; local1063.createdComponents[int2] = local1137; if (local1020) { @@ -2395,7 +2395,7 @@ public final class ScriptRunner { } if (opcode == Cs2Opcodes.setTextAlignment) { isp -= 3; - component.anInt460 = intStack[isp]; + component.halign = intStack[isp]; component.anInt478 = intStack[isp + 1]; component.anInt467 = intStack[isp + 2]; InterfaceList.redraw(component); @@ -2403,7 +2403,7 @@ public final class ScriptRunner { } if (opcode == Cs2Opcodes.setTextAntiMacro) { isp--; - component.textAntiMacro = intStack[isp] == 1; + component.shadowed = intStack[isp] == 1; InterfaceList.redraw(component); continue; } @@ -2587,7 +2587,7 @@ public final class ScriptRunner { } if (opcode == Cs2Opcodes.setTargetVerb) { ssp--; - component.targetVerb = stringStack[ssp]; + component.optionCircumfix = stringStack[ssp]; continue; } if (opcode == Cs2Opcodes.setNoOptions) { @@ -2743,7 +2743,7 @@ public final class ScriptRunner { continue; } if (opcode == Cs2Opcodes.getLayer) { - intStack[isp++] = component.layer; + intStack[isp++] = component.overlayer; continue; } } else if (opcode < 1700) { @@ -2867,7 +2867,7 @@ public final class ScriptRunner { continue; } if (opcode == Cs2Opcodes.getLayer2) { - intStack[isp++] = component.layer; + intStack[isp++] = component.overlayer; continue; } } else if (opcode < 2700) { diff --git a/client/src/main/java/rt4/client.java b/client/src/main/java/rt4/client.java index a1c7f76..b55a93f 100644 --- a/client/src/main/java/rt4/client.java +++ b/client/src/main/java/rt4/client.java @@ -1129,7 +1129,7 @@ public final class client extends GameShell { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = InterfaceList.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.overlayer); } while (priorityComponent == null || priorityComponent.createdComponents == null || priorityComponent.createdComponents.length <= prioritySource.createdComponentId || prioritySource != priorityComponent.createdComponents[prioritySource.createdComponentId]); ScriptRunner.run(priorityRequest); } @@ -1138,7 +1138,7 @@ public final class client extends GameShell { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = InterfaceList.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.overlayer); } while (priorityComponent == null || priorityComponent.createdComponents == null || prioritySource.createdComponentId >= priorityComponent.createdComponents.length || prioritySource != priorityComponent.createdComponents[prioritySource.createdComponentId]); ScriptRunner.run(priorityRequest); } @@ -1147,7 +1147,7 @@ public final class client extends GameShell { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = InterfaceList.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.overlayer); } while (priorityComponent == null || priorityComponent.createdComponents == null || priorityComponent.createdComponents.length <= prioritySource.createdComponentId || prioritySource != priorityComponent.createdComponents[prioritySource.createdComponentId]); ScriptRunner.run(priorityRequest); }