more RSClient refactoring

This commit is contained in:
Lucas
2019-07-08 17:46:10 +02:00
parent a32c667251
commit 112a2bcba7
87 changed files with 1384 additions and 1323 deletions

View File

@@ -134,40 +134,40 @@ public class StructDefinition extends DualNode {
var4.scrollY = 0;
}
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) {
var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETFILL) {
var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTRANS) {
var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETLINEWID) {
var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) {
var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) {
var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTILING) {
var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETMODEL) {
var4.modelType = 1;
var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) {
RouteStrategy.Interpreter_intStackSize -= 6;
@@ -177,7 +177,7 @@ public class StructDefinition extends DualNode {
var4.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
var4.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
var4.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else {
int var5;
@@ -187,58 +187,58 @@ public class StructDefinition extends DualNode {
var4.sequenceId = var5;
var4.modelFrame = 0;
var4.modelFrameCycle = 0;
class22.method295(var4);
WorldMapRectangle.method295(var4);
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) {
var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXT) {
String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
if (!var8.equals(var4.text)) {
var4.text = var8;
class22.method295(var4);
WorldMapRectangle.method295(var4);
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) {
var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) {
RouteStrategy.Interpreter_intStackSize -= 3;
var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) {
var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) {
var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) {
var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETVFLIP) {
var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETHFLIP) {
var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) {
RouteStrategy.Interpreter_intStackSize -= 2;
var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
class22.method295(var4);
WorldMapRectangle.method295(var4);
if (var3 != -1 && var4.type == 0) {
class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
}
@@ -247,26 +247,26 @@ public class StructDefinition extends DualNode {
} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) {
TilePaint.method3060(var4.id, var4.childIndex);
Client.field127 = var4;
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == 1122) {
var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) {
var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == 1124) {
var4.field960 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
WorldMapRectangle.method295(var4);
return 1;
} else if (var0 == 1125) {
var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(DefaultsGroup.method5822(), var5);
if (var7 != null) {
var4.rectangleMode = var7;
class22.method295(var4);
WorldMapRectangle.method295(var4);
}
return 1;