Skip to content

Commit 094ef6e

Browse files
TynarusTynarus
committed
Merge remote-tracking branch 'origin/master'
2 parents c3b562b + b85a09a commit 094ef6e

23 files changed

+207
-206
lines changed

‎src/main/java/org/runejs/OldEngine/MapDecompressor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
import org.runejs.client.Class26;
8-
import org.runejs.client.Class40_Sub5_Sub17_Sub1;
8+
import org.runejs.client.Projectile;
99
import org.runejs.client.Landscape;
1010
import org.runejs.client.MovedStatics;
1111
import org.runejs.client.cache.def.OverlayDefinition;
@@ -135,7 +135,7 @@ public static void spawnObject(int objectId, int x, int y, int z, int rotation,
135135
class20 = groundData[plane];
136136
}
137137
if(localY > 0 && localX > 0 && localY < 103 && localX < 103) {
138-
Class40_Sub5_Sub17_Sub1.addObject(objectId, localX, localY, z, rotation, type, Npc.currentScene, class20);
138+
Projectile.addObject(objectId, localX, localY, z, rotation, type, Npc.currentScene, class20);
139139
}
140140
}
141141

‎src/main/java/org/runejs/OldEngine/ObjectDecompressor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
import org.runejs.client.Class26;
8-
import org.runejs.client.Class40_Sub5_Sub17_Sub1;
8+
import org.runejs.client.Projectile;
99
import org.runejs.client.Landscape;
1010
import org.runejs.client.MovedStatics;
1111
import org.runejs.client.cache.def.OverlayDefinition;
@@ -138,7 +138,7 @@ public static void spawnObject(int objectId, int x, int y, int z, int rotation,
138138
class20 = groundData[plane];
139139
}
140140
if(localY > 0 && localX > 0 && localY < 103 && localX < 103) {
141-
Class40_Sub5_Sub17_Sub1.addObject(objectId, localX, localY, z, rotation, type, Npc.currentScene, class20);
141+
Projectile.addObject(objectId, localX, localY, z, rotation, type, Npc.currentScene, class20);
142142
}
143143
}
144144

‎src/main/java/org/runejs/client/Class13.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ else if(actor.anInt3107 < MovedStatics.pulseCycle)
4343
Class44.method898(255, actor);
4444
else
4545
PlayerAppearance.method381(actor);
46-
Class40_Sub5_Sub17_Sub1.method762(actor);
46+
Projectile.method762(actor);
4747
Class40_Sub5_Sub15.method736(true, actor);
4848
}
4949

‎src/main/java/org/runejs/client/Class24.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static void constructMapRegionObjects(int drawX, int drawY, int drawingPl
7070
collisionMapPlane--;
7171
if(collisionMapPlane >= 0)
7272
collisionMap = collisionMaps[collisionMapPlane];
73-
Class40_Sub5_Sub17_Sub1.addObject(i, tileX, tileY, plane, originalOrientation + orientation & 0x3, objectType, scene, collisionMap);
73+
Projectile.addObject(i, tileX, tileY, plane, originalOrientation + orientation & 0x3, objectType, scene, collisionMap);
7474
}
7575
}
7676
}

‎src/main/java/org/runejs/client/Class33.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static synchronized void method403(int arg0, boolean arg1, int arg2, int
3636
if(Class24.method340()) {
3737
Main.aBoolean1790 = arg7;
3838
MovedStatics.anInt255 = arg2;
39-
Class40_Sub5_Sub17_Sub1.anInt3004 = arg5;
39+
Projectile.anInt3004 = arg5;
4040
Class26.aBoolean618 = arg1;
4141
Class22_Sub1.musicCacheArchive = cacheArchive;
4242
MovedStatics.anInt1806 = -1;
@@ -353,7 +353,7 @@ public static synchronized void method412(boolean arg0, CacheArchive arg1, int a
353353
public static synchronized void method413(byte arg0) {
354354
if(Class24.method340()) {
355355
if(Class26.aBoolean618) {
356-
byte[] is = RSString.method74(Class40_Sub5_Sub17_Sub1.anInt3004, Class22_Sub1.musicCacheArchive, Class8.anInt289, MovedStatics.anInt2110);
356+
byte[] is = RSString.method74(Projectile.anInt3004, Class22_Sub1.musicCacheArchive, Class8.anInt289, MovedStatics.anInt2110);
357357
if(is != null) {
358358
if(MovedStatics.anInt255 < 0) {
359359
if(MovedStatics.anInt1806 < 0)
@@ -378,7 +378,7 @@ public static synchronized void method414(boolean arg0, int arg1, int songid, in
378378
MovedStatics.anInt1806 = -1;
379379
MovedStatics.anInt255 = -1;
380380
OverlayDefinition.anInt2342 = arg3;
381-
Class40_Sub5_Sub17_Sub1.anInt3004 = arg4;
381+
Projectile.anInt3004 = arg4;
382382
Main.aBoolean1790 = arg0;
383383
MovedStatics.anInt2110 = arg1;
384384
Class22_Sub1.musicCacheArchive = arg5;

‎src/main/java/org/runejs/client/Class37.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ else if(isTeammate)
176176
AnimationSequence.minimapCompass.shapeImageToPixels(0, 0, 33, 33, 25, 25, GroundItemTile.cameraHorizontal, 256, RSCanvas.anIntArray62, RSCanvas.anIntArray66);
177177
MovedStatics.minimapBackgroundImage.drawImage(0, 0);
178178

179-
if(MovedStatics.menuOpen && ScreenController.frameMode == ScreenMode.FIXED && Class40_Sub5_Sub17_Sub1.menuScreenArea == 1) {
179+
if(MovedStatics.menuOpen && ScreenController.frameMode == ScreenMode.FIXED && Projectile.menuScreenArea == 1) {
180180
Class40_Sub5_Sub6.drawMenu(550, 4);
181181
}
182182
ActorDefinition.drawMapBack();

‎src/main/java/org/runejs/client/Class40_Sub5_Sub6.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,15 @@ public static void drawMenu(int xOffSet, int yOffSet) {
301301
TypeFace.fontBold.drawString(English.chooseOption, offsetX + 3, 14 + offsetY, colour);
302302
int x = Class13.mouseX - (xOffSet);
303303
int y = (-yOffSet) + Landscape.mouseY;
304-
if(Class40_Sub5_Sub17_Sub1.menuScreenArea == 0) {
304+
if(Projectile.menuScreenArea == 0) {
305305
x -= 4;
306306
y -= 4;
307307
}
308-
if(Class40_Sub5_Sub17_Sub1.menuScreenArea == 1) {
308+
if(Projectile.menuScreenArea == 1) {
309309
y -= 205;
310310
x -= 553;
311311
}
312-
if(Class40_Sub5_Sub17_Sub1.menuScreenArea == 2) {
312+
if(Projectile.menuScreenArea == 2) {
313313
y -= 357;
314314
x -= 17;
315315
}

‎src/main/java/org/runejs/client/Class43.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
public class Class43 {
2323
public static int cameraYawOffset = 0;
24-
public static LinkedList aLinkedList_1022 = new LinkedList();
24+
public static LinkedList projectileQueue = new LinkedList();
2525
public static int bankInsertMode = 0;
2626

2727
public static void threadSleep(long ms) {
@@ -48,7 +48,7 @@ public static void drawTabArea(int arg0) {
4848
if(!bool)
4949
GameInterface.redrawTabArea = true;
5050
}
51-
if(MovedStatics.menuOpen && Class40_Sub5_Sub17_Sub1.menuScreenArea == 1) {
51+
if(MovedStatics.menuOpen && Projectile.menuScreenArea == 1) {
5252
if(MovedStatics.anInt848 == 1)
5353
method398(-2);
5454
else if(ScreenController.frameMode == ScreenMode.FIXED)
@@ -180,15 +180,15 @@ public static void method398(int arg0) {
180180
TypeFace.fontBold.drawShadowedString(class1, 3 + i_0_, 14 + i_2_, false, i_3_);
181181
int i_4_ = Class13.mouseX;
182182
int i_5_ = Landscape.mouseY;
183-
if(Class40_Sub5_Sub17_Sub1.menuScreenArea == 0) {
183+
if(Projectile.menuScreenArea == 0) {
184184
i_4_ -= 4;
185185
i_5_ -= 4;
186186
}
187-
if(Class40_Sub5_Sub17_Sub1.menuScreenArea == 1) {
187+
if(Projectile.menuScreenArea == 1) {
188188
i_4_ -= 553;
189189
i_5_ -= 205;
190190
}
191-
if(Class40_Sub5_Sub17_Sub1.menuScreenArea == 2) {
191+
if(Projectile.menuScreenArea == 2) {
192192
i_5_ -= 357;
193193
i_4_ -= 17;
194194
}

‎src/main/java/org/runejs/client/Class60.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static void determineMenuSize() {
5959
int height = ActorDefinition.menuActionRow * 15 + 21;
6060
if(ScreenController.frameMode == ScreenMode.FIXED){
6161
if(Class57.clickX > 4 && RSString.clickY > 4 && Class57.clickX < 516 && RSString.clickY < 338) {
62-
Class40_Sub5_Sub17_Sub1.menuScreenArea = 0;
62+
Projectile.menuScreenArea = 0;
6363
CollisionMap.menuHeight = ActorDefinition.menuActionRow * 15 + 22;
6464
MovedStatics.menuOpen = true;
6565
int x = -(width / 2) + -4 + Class57.clickX;
@@ -78,7 +78,7 @@ public static void determineMenuSize() {
7878
}
7979
if(Class57.clickX > 553 && RSString.clickY > 205 && Class57.clickX < 743 && RSString.clickY < 466) {
8080
CollisionMap.menuHeight = 22 + 15 * ActorDefinition.menuActionRow;
81-
Class40_Sub5_Sub17_Sub1.menuScreenArea = 1;
81+
Projectile.menuScreenArea = 1;
8282
int y = -205 + RSString.clickY;
8383
int x = -(width / 2) + -553 + Class57.clickX;
8484
if(x < 0)
@@ -97,7 +97,7 @@ else if(width + x > 190)
9797
}
9898
if(Class57.clickX > 17 && RSString.clickY > 357 && Class57.clickX < 496 && RSString.clickY < 453) {
9999
VertexNormal.menuWidth = width;
100-
Class40_Sub5_Sub17_Sub1.menuScreenArea = 2;
100+
Projectile.menuScreenArea = 2;
101101
CollisionMap.menuHeight = ActorDefinition.menuActionRow * 15 + 22;
102102
int y = RSString.clickY + -357;
103103
if(y >= 0) {
@@ -116,7 +116,7 @@ else if(x + width > 479)
116116
}
117117

118118
} else if(Class57.clickX > 0 && RSString.clickY > 0 && Class57.clickX < GameShell.clientFrame.getWidth() && RSString.clickY < GameShell.clientFrame.getHeight()) {
119-
Class40_Sub5_Sub17_Sub1.menuScreenArea = 0;
119+
Projectile.menuScreenArea = 0;
120120
int x = -(width / 2) + -4 + Class57.clickX;
121121
if(width + x > GameShell.clientFrame.getWidth() - 4)
122122
x = GameShell.clientFrame.getWidth() - 4;
@@ -188,6 +188,7 @@ public static void method992() {
188188

189189
public static void updateLogin() {
190190
MovedStatics.method836(1);
191+
191192
if(MouseHandler.clickType == 1 && RSString.clickY >= ScreenController.drawHeight-42 && Class57.clickX>=ScreenController.drawWidth-42 ){
192193
int newVolume = 0;
193194
if(RSCanvas.musicVolume == 0) {
@@ -197,8 +198,10 @@ public static void updateLogin() {
197198
if(newVolume == 0) {
198199
Class33.method402(false);
199200
Class35.songTimeout = 0;
200-
} else
201+
} else {
202+
Class33.method412(false, CacheArchive.musicCacheArchive, 0, (byte) 66, Native.titleSong, 10, "", RSCanvas.musicVolume);
201203
MovedStatics.method456(newVolume);
204+
}
202205
} else {
203206
Class33.method414(false, 0, MouseHandler.currentSongId, newVolume, 0, CacheArchive.musicCacheArchive);
204207
Class35.songTimeout = 0;

‎src/main/java/org/runejs/client/ClientScriptRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
887887
int i_79_ = Class8.aCalendar279.get(Calendar.DATE);
888888
int i_80_ = Class8.aCalendar279.get(Calendar.MONTH);
889889
int i_81_ = Class8.aCalendar279.get(Calendar.YEAR);
890-
scriptStringValues[stringValueIndex++] = i_79_ + "-" + Class40_Sub5_Sub17_Sub1.aClass1Array2964[i_80_] + "-" + i_81_;
890+
scriptStringValues[stringValueIndex++] = i_79_ + "-" + Projectile.aClass1Array2964[i_80_] + "-" + i_81_;
891891
} else if(scriptOpcode == 4105) {
892892
stringValueIndex -= 2;
893893
String class1 = scriptStringValues[stringValueIndex];

0 commit comments

Comments
 (0)