diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java index 0b1d29f..41644aa 100644 --- a/client/src/main/java/GameShell.java +++ b/client/src/main/java/GameShell.java @@ -524,6 +524,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (updateDelta >= FIXED_UPDATE_RATE * 1_000_000) { this.mainLoopWrapper(); lastUpdateTime = currentTime; + flush(signLink, canvas); } renderDelta = currentTime - lastDrawTime; diff --git a/client/src/main/java/Mouse.java b/client/src/main/java/Mouse.java index 870e05c..6b0b59d 100644 --- a/client/src/main/java/Mouse.java +++ b/client/src/main/java/Mouse.java @@ -55,7 +55,7 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis if (Static93.instance != null) { Static93.anInt2467 = 0; Static147.anInt3521 = x; - Static165.anInt4039 = x; + Static165.anInt4039 = y; } } diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java index 7dd9693..05201e1 100644 --- a/client/src/main/java/Static103.java +++ b/client/src/main/java/Static103.java @@ -192,7 +192,7 @@ public final class Static103 { } else if (Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, Static173.self.movementQueueX[0])) { Static6.outboundBuffer.p1(Static1.anInt5); Static6.outboundBuffer.p1(Static107.anInt2878); - Static6.outboundBuffer.p2(Camera.getYaw()); + Static6.outboundBuffer.p2((int)Camera.yawTarget); Static6.outboundBuffer.p1(57); Static6.outboundBuffer.p1(Static59.anInt1814); Static6.outboundBuffer.p1(Static273.anInt4130); diff --git a/client/src/main/java/Static160.java b/client/src/main/java/Static160.java index 9fc9145..acfd1c0 100644 --- a/client/src/main/java/Static160.java +++ b/client/src/main/java/Static160.java @@ -40,9 +40,9 @@ public final class Static160 { Static129.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45); } } else if (GlRenderer.enabled) { - ((GlSprite) Static106.aClass3_Sub2_Sub1_7).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Camera.getYaw(), 256, (GlSprite) arg2.method489(false)); + ((GlSprite) Static106.aClass3_Sub2_Sub1_7).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, (int)Camera.yawTarget, 256, (GlSprite) arg2.method489(false)); } else { - ((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Camera.getYaw(), arg2.anIntArray37, arg2.anIntArray45); + ((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, (int)Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45); } Static31.rectangleRedraw[arg3] = true; } diff --git a/client/src/main/java/Static250.java b/client/src/main/java/Static250.java index bb8601d..664c616 100644 --- a/client/src/main/java/Static250.java +++ b/client/src/main/java/Static250.java @@ -52,16 +52,16 @@ public final class Static250 { @Pc(104) int code = Static227.keyCodes[local93]; if (code == Keyboard.KEY_UP) { Camera.pitchDirection = 1; - Camera.pitchTarget = Camera.getPitch() + 47 & 0xFFFFFFF0; + Camera.pitchTarget += 47; } else if (code == Keyboard.KEY_DOWN) { Camera.pitchDirection = 0; - Camera.pitchTarget = Camera.getPitch() - 17 & 0xFFFFFFF0; + Camera.pitchTarget -= 17; } else if (code == Keyboard.KEY_LEFT) { Camera.yawDirection = 1; - Camera.yawTarget = Camera.getYaw() - 65 & 0xFFFFFF80; + Camera.yawTarget -= 65; } else if (code == Keyboard.KEY_RIGHT) { Camera.yawDirection = 0; - Camera.yawTarget = Camera.getYaw() + 191 & 0xFFFFFF80; + Camera.yawTarget += 191; } } Camera.clampCameraAngle(); diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java index 1b1a7ad..e99fa2f 100644 --- a/client/src/main/java/Static253.java +++ b/client/src/main/java/Static253.java @@ -46,8 +46,8 @@ public final class Static253 { @Pc(59) int local59; @Pc(57) int local57; if (Static227.cameraType == 1) { - local57 = Static230.anInt5161 + Camera.getYaw() & 0x7FF; - local59 = Camera.getPitch(); + local57 = Static230.anInt5161 + (int)Camera.yawTarget & 0x7FF; + local59 = (int)Camera.pitchTarget; if (local59 < Static234.anInt5245 / 256) { local59 = Static234.anInt5245 / 256; } diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index 5682abc..d0dde4c 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -700,8 +700,8 @@ public final class Static4 { Camera.yawTarget = local133; Camera.pitchTarget = local864; if (Static227.cameraType == 2) { - Static240.cameraPitch = Camera.getPitch(); - Static184.cameraYaw = Camera.getYaw(); + Static240.cameraPitch = (int)Camera.pitchTarget; + Static184.cameraYaw = (int)Camera.yawTarget; } Camera.clampCameraAngle(); } diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index 893c4e1..8f58936 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -26,7 +26,7 @@ public final class Static54 { Static129.method2496(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459); } if (Static270.anInt5795 != 2 && Static270.anInt5795 != 5 && Static89.aClass3_Sub2_Sub1_5 != null) { - @Pc(48) int local48 = Static59.anInt1814 + Camera.getYaw() & 0x7FF; + @Pc(48) int local48 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(57) int local57 = Static173.self.xFine / 32 + 48; @Pc(67) int local67 = 464 - Static173.self.zFine / 32; if (GlRenderer.enabled) { diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java index e136154..dd244c1 100644 --- a/client/src/main/java/Static60.java +++ b/client/src/main/java/Static60.java @@ -37,7 +37,7 @@ public final class Static60 { return; } @Pc(21) int local21 = arg3 * arg3 + arg2 * arg2; - @Pc(27) int local27 = Static59.anInt1814 + Camera.getYaw() & 0x7FF; + @Pc(27) int local27 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(39) int local39 = Math.max(arg0.anInt445 / 2, arg0.anInt459 / 2) + 10; if (local39 * local39 < local21) { return; diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index 9c042cf..0109657 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -243,8 +243,8 @@ public final class Static81 { Static16.anInt551 = 20; Static197.aBoolean228 = false; Static6.outboundBuffer.p1isaac(21); - Static6.outboundBuffer.p2add(Camera.getPitch()); - Static6.outboundBuffer.p2le(Camera.getYaw()); + Static6.outboundBuffer.p2add((int)Camera.pitchTarget); + Static6.outboundBuffer.p2le((int)Camera.yawTarget); } if (GameShell.focus && !Static67.prevFocus) { Static67.prevFocus = true; diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index 1586222..481e1ce 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -236,7 +236,7 @@ public final class Static87 { continue; } local276 -= local30.anInt459 / 2; - local503 = Camera.getYaw() + Static59.anInt1814 & 0x7FF; + local503 = (int)Camera.yawTarget + Static59.anInt1814 & 0x7FF; local270 -= local30.anInt445 / 2; local514 = MathUtils.anIntArray223[local503]; local518 = MathUtils.anIntArray225[local503]; diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index 4f71a01..44fe513 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -3105,18 +3105,18 @@ public final class Static88 { Camera.pitchTarget = Static254.intStack[isp]; Camera.yawTarget = Static254.intStack[isp + 1]; if (Static227.cameraType == 2) { - Static184.cameraYaw = Camera.getYaw(); - Static240.cameraPitch = Camera.getPitch(); + Static184.cameraYaw = (int)Camera.yawTarget; + Static240.cameraPitch = (int)Camera.pitchTarget; } Camera.clampCameraAngle(); continue; } if (opcode == 5505) { - Static254.intStack[isp++] = Camera.getPitch(); + Static254.intStack[isp++] = (int)Camera.pitchTarget; continue; } if (opcode == 5506) { - Static254.intStack[isp++] = Camera.getYaw(); + Static254.intStack[isp++] = (int)Camera.yawTarget; continue; } } else if (opcode < 5700) { diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java index 538662c..dc4d2fd 100644 --- a/client/src/main/java/Static97.java +++ b/client/src/main/java/Static97.java @@ -35,7 +35,7 @@ public final class Static97 { return; } local30 -= 10; - @Pc(58) int local58 = Static59.anInt1814 + Camera.getYaw() & 0x7FF; + @Pc(58) int local58 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(62) int local62 = MathUtils.anIntArray225[local58]; @Pc(66) int local66 = MathUtils.anIntArray223[local58]; @Pc(74) int local74 = local66 * 256 / (Static273.anInt4130 + 256);