Skip to content

Commit ce8cfc6

Browse files
committed
refactor: remove junk param
1 parent a333abf commit ce8cfc6

File tree

2 files changed

+23
-25
lines changed

2 files changed

+23
-25
lines changed

src/main/java/org/runejs/client/MovedStatics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1481,7 +1481,7 @@ private static void addObject(int arg0, int arg1, int arg2, int arg3, int arg4,
14811481
int i_5_ = arg7;
14821482
if(i_5_ < 3 && (tile_flags[1][arg2][arg0] & 0x2) == 2)
14831483
i_5_++;
1484-
CollisionMap.addObject(Landscape.currentCollisionMap[arg7], arg1, i_5_, arg7, arg3, Game.currentScene, -22078, arg4, arg0, arg2);
1484+
CollisionMap.addObject(Landscape.currentCollisionMap[arg7], arg1, i_5_, arg7, arg3, Game.currentScene, arg4, arg0, arg2);
14851485
}
14861486
}
14871487
}

src/main/java/org/runejs/client/scene/util/CollisionMap.java

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static void method144(int arg0) {
4141
}
4242

4343

44-
public static void addObject(CollisionMap arg0, int arg1, int arg2, int arg3, int arg4, Scene arg5, int arg6, int arg7, int arg8, int arg9) {
44+
public static void addObject(CollisionMap arg0, int arg1, int arg2, int arg3, int arg4, Scene arg5, int arg7, int arg8, int arg9) {
4545
int i = Landscape.tile_height[arg2][arg9][arg8];
4646
int i_0_ = Landscape.tile_height[arg2][1 + arg9][arg8];
4747
int i_1_ = Landscape.tile_height[arg2][arg9][1 + arg8];
@@ -186,29 +186,27 @@ public static void addObject(CollisionMap arg0, int arg1, int arg2, int arg3, in
186186
else
187187
renderable = new GameObject(arg1, 4, 0, i, i_0_, i_2_, i_1_, gameObjectDefinition.animationId, true);
188188
arg5.addWallDecoration(arg9, arg8, arg3, i_3_, MovedStatics.anIntArray666[arg7] * i_14_, MovedStatics.anIntArray2207[arg7] * i_14_, 512 * arg7, i_5_, renderable, i_4_, SceneCluster.anIntArray761[arg7]);
189-
} else if (arg6 == -22078) {
190-
if (arg4 == 6) {
191-
Renderable renderable;
192-
if (gameObjectDefinition.animationId != -1 || gameObjectDefinition.childIds != null)
193-
renderable = new GameObject(arg1, 4, 0, i, i_0_, i_2_, i_1_, gameObjectDefinition.animationId, true);
194-
else
195-
renderable = gameObjectDefinition.createTerrainObjectModel(i_2_, i_1_, 0, i, 4, i_0_);
196-
arg5.addWallDecoration(arg9, arg8, arg3, i_3_, 0, 0, arg7, i_5_, renderable, i_4_, 256);
197-
} else if (arg4 == 7) {
198-
Renderable renderable;
199-
if (gameObjectDefinition.animationId == -1 && gameObjectDefinition.childIds == null)
200-
renderable = gameObjectDefinition.createTerrainObjectModel(i_2_, i_1_, 0, i, 4, i_0_);
201-
else
202-
renderable = new GameObject(arg1, 4, 0, i, i_0_, i_2_, i_1_, gameObjectDefinition.animationId, true);
203-
arg5.addWallDecoration(arg9, arg8, arg3, i_3_, 0, 0, arg7, i_5_, renderable, i_4_, 512);
204-
} else if (arg4 == 8) {
205-
Renderable renderable;
206-
if (gameObjectDefinition.animationId != -1 || gameObjectDefinition.childIds != null)
207-
renderable = new GameObject(arg1, 4, 0, i, i_0_, i_2_, i_1_, gameObjectDefinition.animationId, true);
208-
else
209-
renderable = gameObjectDefinition.createTerrainObjectModel(i_2_, i_1_, 0, i, 4, i_0_);
210-
arg5.addWallDecoration(arg9, arg8, arg3, i_3_, 0, 0, arg7, i_5_, renderable, i_4_, 768);
211-
}
189+
} else if (arg4 == 6) {
190+
Renderable renderable;
191+
if (gameObjectDefinition.animationId != -1 || gameObjectDefinition.childIds != null)
192+
renderable = new GameObject(arg1, 4, 0, i, i_0_, i_2_, i_1_, gameObjectDefinition.animationId, true);
193+
else
194+
renderable = gameObjectDefinition.createTerrainObjectModel(i_2_, i_1_, 0, i, 4, i_0_);
195+
arg5.addWallDecoration(arg9, arg8, arg3, i_3_, 0, 0, arg7, i_5_, renderable, i_4_, 256);
196+
} else if (arg4 == 7) {
197+
Renderable renderable;
198+
if (gameObjectDefinition.animationId == -1 && gameObjectDefinition.childIds == null)
199+
renderable = gameObjectDefinition.createTerrainObjectModel(i_2_, i_1_, 0, i, 4, i_0_);
200+
else
201+
renderable = new GameObject(arg1, 4, 0, i, i_0_, i_2_, i_1_, gameObjectDefinition.animationId, true);
202+
arg5.addWallDecoration(arg9, arg8, arg3, i_3_, 0, 0, arg7, i_5_, renderable, i_4_, 512);
203+
} else if (arg4 == 8) {
204+
Renderable renderable;
205+
if (gameObjectDefinition.animationId != -1 || gameObjectDefinition.childIds != null)
206+
renderable = new GameObject(arg1, 4, 0, i, i_0_, i_2_, i_1_, gameObjectDefinition.animationId, true);
207+
else
208+
renderable = gameObjectDefinition.createTerrainObjectModel(i_2_, i_1_, 0, i, 4, i_0_);
209+
arg5.addWallDecoration(arg9, arg8, arg3, i_3_, 0, 0, arg7, i_5_, renderable, i_4_, 768);
212210
}
213211
}
214212

0 commit comments

Comments
 (0)