2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-12 01:21:23 -07:00
Code Issues Projects Releases Packages Wiki Activity

Reverted some input behaviors changed in the m/kb refactor

Browse source
This commit is contained in:
Pazaz 2022-04-23 17:32:21 -04:00
parent a3420acc1c
commit 4bac15d704
13 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/src/main/java/GameShell.java
View file

@ -524,6 +524,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if (updateDelta >= FIXED_UPDATE_RATE * 1_000_000) { if (updateDelta >= FIXED_UPDATE_RATE * 1_000_000) {
this.mainLoopWrapper(); this.mainLoopWrapper();
lastUpdateTime = currentTime; lastUpdateTime = currentTime;
flush(signLink, canvas);
} }
renderDelta = currentTime - lastDrawTime; renderDelta = currentTime - lastDrawTime;

2
client/src/main/java/Mouse.java
View file

@ -55,7 +55,7 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
if (Static93.instance != null) { if (Static93.instance != null) {
Static93.anInt2467 = 0; Static93.anInt2467 = 0;
Static147.anInt3521 = x; Static147.anInt3521 = x;
Static165.anInt4039 = x; Static165.anInt4039 = y;
} }
} }

2
client/src/main/java/Static103.java
View file

@ -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])) { } 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(Static1.anInt5);
Static6.outboundBuffer.p1(Static107.anInt2878); Static6.outboundBuffer.p1(Static107.anInt2878);
Static6.outboundBuffer.p2(Camera.getYaw()); Static6.outboundBuffer.p2((int)Camera.yawTarget);
Static6.outboundBuffer.p1(57); Static6.outboundBuffer.p1(57);
Static6.outboundBuffer.p1(Static59.anInt1814); Static6.outboundBuffer.p1(Static59.anInt1814);
Static6.outboundBuffer.p1(Static273.anInt4130); Static6.outboundBuffer.p1(Static273.anInt4130);

4
client/src/main/java/Static160.java
View file

@ -40,9 +40,9 @@ public final class Static160 {
Static129.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45); Static129.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45);
} }
} else if (GlRenderer.enabled) { } 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 { } 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; Static31.rectangleRedraw[arg3] = true;
} }

8
client/src/main/java/Static250.java
View file

@ -52,16 +52,16 @@ public final class Static250 {
@Pc(104) int code = Static227.keyCodes[local93]; @Pc(104) int code = Static227.keyCodes[local93];
if (code == Keyboard.KEY_UP) { if (code == Keyboard.KEY_UP) {
Camera.pitchDirection = 1; Camera.pitchDirection = 1;
Camera.pitchTarget = Camera.getPitch() + 47 & 0xFFFFFFF0; Camera.pitchTarget += 47;
} else if (code == Keyboard.KEY_DOWN) { } else if (code == Keyboard.KEY_DOWN) {
Camera.pitchDirection = 0; Camera.pitchDirection = 0;
Camera.pitchTarget = Camera.getPitch() - 17 & 0xFFFFFFF0; Camera.pitchTarget -= 17;
} else if (code == Keyboard.KEY_LEFT) { } else if (code == Keyboard.KEY_LEFT) {
Camera.yawDirection = 1; Camera.yawDirection = 1;
Camera.yawTarget = Camera.getYaw() - 65 & 0xFFFFFF80; Camera.yawTarget -= 65;
} else if (code == Keyboard.KEY_RIGHT) { } else if (code == Keyboard.KEY_RIGHT) {
Camera.yawDirection = 0; Camera.yawDirection = 0;
Camera.yawTarget = Camera.getYaw() + 191 & 0xFFFFFF80; Camera.yawTarget += 191;
} }
} }
Camera.clampCameraAngle(); Camera.clampCameraAngle();

4
client/src/main/java/Static253.java
View file

@ -46,8 +46,8 @@ public final class Static253 {
@Pc(59) int local59; @Pc(59) int local59;
@Pc(57) int local57; @Pc(57) int local57;
if (Static227.cameraType == 1) { if (Static227.cameraType == 1) {
local57 = Static230.anInt5161 + Camera.getYaw() & 0x7FF; local57 = Static230.anInt5161 + (int)Camera.yawTarget & 0x7FF;
local59 = Camera.getPitch(); local59 = (int)Camera.pitchTarget;
if (local59 < Static234.anInt5245 / 256) { if (local59 < Static234.anInt5245 / 256) {
local59 = Static234.anInt5245 / 256; local59 = Static234.anInt5245 / 256;
} }

4
client/src/main/java/Static4.java
View file

@ -700,8 +700,8 @@ public final class Static4 {
Camera.yawTarget = local133; Camera.yawTarget = local133;
Camera.pitchTarget = local864; Camera.pitchTarget = local864;
if (Static227.cameraType == 2) { if (Static227.cameraType == 2) {
Static240.cameraPitch = Camera.getPitch(); Static240.cameraPitch = (int)Camera.pitchTarget;
Static184.cameraYaw = Camera.getYaw(); Static184.cameraYaw = (int)Camera.yawTarget;
} }
Camera.clampCameraAngle(); Camera.clampCameraAngle();
} }

2
client/src/main/java/Static54.java
View file

@ -26,7 +26,7 @@ public final class Static54 {
Static129.method2496(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459); Static129.method2496(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459);
} }
if (Static270.anInt5795 != 2 && Static270.anInt5795 != 5 && Static89.aClass3_Sub2_Sub1_5 != null) { 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(57) int local57 = Static173.self.xFine / 32 + 48;
@Pc(67) int local67 = 464 - Static173.self.zFine / 32; @Pc(67) int local67 = 464 - Static173.self.zFine / 32;
if (GlRenderer.enabled) { if (GlRenderer.enabled) {

2
client/src/main/java/Static60.java
View file

@ -37,7 +37,7 @@ public final class Static60 {
return; return;
} }
@Pc(21) int local21 = arg3 * arg3 + arg2 * arg2; @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; @Pc(39) int local39 = Math.max(arg0.anInt445 / 2, arg0.anInt459 / 2) + 10;
if (local39 * local39 < local21) { if (local39 * local39 < local21) {
return; return;

4
client/src/main/java/Static81.java
View file

@ -243,8 +243,8 @@ public final class Static81 {
Static16.anInt551 = 20; Static16.anInt551 = 20;
Static197.aBoolean228 = false; Static197.aBoolean228 = false;
Static6.outboundBuffer.p1isaac(21); Static6.outboundBuffer.p1isaac(21);
Static6.outboundBuffer.p2add(Camera.getPitch()); Static6.outboundBuffer.p2add((int)Camera.pitchTarget);
Static6.outboundBuffer.p2le(Camera.getYaw()); Static6.outboundBuffer.p2le((int)Camera.yawTarget);
} }
if (GameShell.focus && !Static67.prevFocus) { if (GameShell.focus && !Static67.prevFocus) {
Static67.prevFocus = true; Static67.prevFocus = true;

2
client/src/main/java/Static87.java
View file

@ -236,7 +236,7 @@ public final class Static87 {
continue; continue;
} }
local276 -= local30.anInt459 / 2; local276 -= local30.anInt459 / 2;
local503 = Camera.getYaw() + Static59.anInt1814 & 0x7FF; local503 = (int)Camera.yawTarget + Static59.anInt1814 & 0x7FF;
local270 -= local30.anInt445 / 2; local270 -= local30.anInt445 / 2;
local514 = MathUtils.anIntArray223[local503]; local514 = MathUtils.anIntArray223[local503];
local518 = MathUtils.anIntArray225[local503]; local518 = MathUtils.anIntArray225[local503];

8
client/src/main/java/Static88.java
View file

@ -3105,18 +3105,18 @@ public final class Static88 {
Camera.pitchTarget = Static254.intStack[isp]; Camera.pitchTarget = Static254.intStack[isp];
Camera.yawTarget = Static254.intStack[isp + 1]; Camera.yawTarget = Static254.intStack[isp + 1];
if (Static227.cameraType == 2) { if (Static227.cameraType == 2) {
Static184.cameraYaw = Camera.getYaw(); Static184.cameraYaw = (int)Camera.yawTarget;
Static240.cameraPitch = Camera.getPitch(); Static240.cameraPitch = (int)Camera.pitchTarget;
} }
Camera.clampCameraAngle(); Camera.clampCameraAngle();
continue; continue;
} }
if (opcode == 5505) { if (opcode == 5505) {
Static254.intStack[isp++] = Camera.getPitch(); Static254.intStack[isp++] = (int)Camera.pitchTarget;
continue; continue;
} }
if (opcode == 5506) { if (opcode == 5506) {
Static254.intStack[isp++] = Camera.getYaw(); Static254.intStack[isp++] = (int)Camera.yawTarget;
continue; continue;
} }
} else if (opcode < 5700) { } else if (opcode < 5700) {

2
client/src/main/java/Static97.java
View file

@ -35,7 +35,7 @@ public final class Static97 {
return; return;
} }
local30 -= 10; 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(62) int local62 = MathUtils.anIntArray225[local58];
@Pc(66) int local66 = MathUtils.anIntArray223[local58]; @Pc(66) int local66 = MathUtils.anIntArray223[local58];
@Pc(74) int local74 = local66 * 256 / (Static273.anInt4130 + 256); @Pc(74) int local74 = local66 * 256 / (Static273.anInt4130 + 256);