More refactoring (tm)

This commit is contained in:
Lucas
2019-07-07 15:10:50 +02:00
parent e1a815eddd
commit e2aac6d899
159 changed files with 38213 additions and 46222 deletions

View File

@@ -57,9 +57,9 @@ public class FontName {
)
@Export("calculateTag")
public static long calculateTag(int x, int y, int type, boolean isNotInteractable, int identifier) {
long var5 = (long)((x & 0b1111111) << 0 | (y & 0b1111111) << 7 | (type & 0b11) << 14) | ((long)identifier & 0xffffffffL) << 17;
long var5 = (long)((x & 127) << 0 | (y & 127) << 7 | (type & 3) << 14) | ((long)identifier & 4294967295L) << 17;
if (isNotInteractable) {
var5 |= 0x10000L;
var5 |= 65536L;
}
return var5;
@@ -211,7 +211,7 @@ public class FontName {
return 1;
} else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.field96 : 0;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.minKick : 0;
return 1;
} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@@ -498,16 +498,16 @@ public class FontName {
garbageValue = "-2003105831"
)
@Export("setViewportShape")
static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
if (var2 < 1) {
var2 = 1;
static final void setViewportShape(int x, int y, int width, int height, boolean clear) {
if (width < 1) {
width = 1;
}
if (var3 < 1) {
var3 = 1;
if (height < 1) {
height = 1;
}
int var5 = var3 - 334;
int var5 = height - 334;
int var6;
if (var5 < 0) {
var6 = Client.field130;
@@ -517,53 +517,53 @@ public class FontName {
var6 = (Client.field131 - Client.field130) * var5 / 100 + Client.field130;
}
int var7 = var3 * var6 * 512 / (var2 * 334);
int var7 = height * var6 * 512 / (width * 334);
int var8;
int var9;
short var10;
if (var7 < Client.field132) {
var10 = Client.field132;
var6 = var10 * var2 * 334 / (var3 * 512);
var6 = var10 * width * 334 / (height * 512);
if (var6 > Client.field134) {
var6 = Client.field134;
var8 = var3 * var6 * 512 / (var10 * 334);
var9 = (var2 - var8) / 2;
if (var4) {
var8 = height * var6 * 512 / (var10 * 334);
var9 = (width - var8) / 2;
if (clear) {
Rasterizer2D.Rasterizer2D_resetClip();
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(x, y, var9, height, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(x + width - var9, y, var9, height, -16777216);
}
var0 += var9;
var2 -= var9 * 2;
x += var9;
width -= var9 * 2;
}
} else if (var7 > Client.field133) {
var10 = Client.field133;
var6 = var10 * var2 * 334 / (var3 * 512);
var6 = var10 * width * 334 / (height * 512);
if (var6 < Client.field135) {
var6 = Client.field135;
var8 = var10 * var2 * 334 / (var6 * 512);
var9 = (var3 - var8) / 2;
if (var4) {
var8 = var10 * width * 334 / (var6 * 512);
var9 = (height - var8) / 2;
if (clear) {
Rasterizer2D.Rasterizer2D_resetClip();
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, var9, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(x, height + y - var9, width, var9, -16777216);
}
var1 += var9;
var3 -= var9 * 2;
y += var9;
height -= var9 * 2;
}
}
Client.viewportZoom = var3 * var6 / 334;
if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
ScriptEvent.method1183(var2, var3);
Client.viewportZoom = height * var6 / 334;
if (width != Client.viewportWidth || height != Client.viewportHeight) {
ScriptEvent.method1183(width, height);
}
Client.viewportOffsetX = var0;
Client.viewportOffsetY = var1;
Client.viewportWidth = var2;
Client.viewportHeight = var3;
Client.viewportOffsetX = x;
Client.viewportOffsetY = y;
Client.viewportWidth = width;
Client.viewportHeight = height;
}
@ObfuscatedName("km")