Skip to content

Commit eba13bb

Browse files
committed
refactor: rename methods in Scene class
1 parent de1bbea commit eba13bb

File tree

7 files changed

+103
-97
lines changed

7 files changed

+103
-97
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,15 +556,15 @@ else if(s > 255)
556556
}
557557
for(int i_56_ = 1; i_56_ < 103; i_56_++) {
558558
for(int i_57_ = 1; i_57_ < 103; i_57_++)
559-
scene.method130(_plane, i_57_, i_56_, MovedStatics.getVisibilityPlaneFor(_plane, i_56_, 0, i_57_));
559+
scene.setDrawLevel(_plane, i_57_, i_56_, MovedStatics.getVisibilityPlaneFor(_plane, i_56_, 0, i_57_));
560560
}
561561
tile_underlayids[_plane] = null;
562562
tile_overlayids[_plane] = null;
563563
tile_underlay_path[_plane] = null;
564564
tile_overlay_rotation[_plane] = null;
565565
tileShadowIntensity[_plane] = null;
566566
}
567-
scene.method118(-50, -10, -50);
567+
scene.buildModels(-50, -10, -50);
568568
for(int i = 0; i < 104; i++) {
569569
for(int i_58_ = 0; i_58_ < 104; i_58_++) {
570570
if((MovedStatics.tile_flags[1][i][i_58_] & 0x2) == 2)
@@ -1090,7 +1090,7 @@ public static void addObject(int objectId, int localX, int localY, int plane, in
10901090
if(gameObjectDefinition.solid && collisionMap != null)
10911091
collisionMap.unmarkWall(localX, localY, type, face, gameObjectDefinition.walkable);
10921092
if(gameObjectDefinition.setDecorDisplacement != 16)
1093-
scene.method115(plane, localX, localY, gameObjectDefinition.setDecorDisplacement);
1093+
scene.setWallDecorationOffset(plane, localX, localY, gameObjectDefinition.setDecorDisplacement);
10941094
} else if(type == 1) {
10951095
Renderable renderable;
10961096
if(gameObjectDefinition.animationId == -1 && gameObjectDefinition.childIds == null)
@@ -1140,7 +1140,7 @@ else if(face == 3)
11401140
if(gameObjectDefinition.solid && collisionMap != null)
11411141
collisionMap.unmarkWall(localX, localY, type, face, gameObjectDefinition.walkable);
11421142
if(gameObjectDefinition.setDecorDisplacement != 16)
1143-
scene.method115(plane, localX, localY, gameObjectDefinition.setDecorDisplacement);
1143+
scene.setWallDecorationOffset(plane, localX, localY, gameObjectDefinition.setDecorDisplacement);
11441144
} else if(type == 3) {
11451145
Renderable renderable;
11461146
if(gameObjectDefinition.animationId != -1 || gameObjectDefinition.childIds != null)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,7 @@ public static ImageRGB method1028(CacheArchive arg0, String arg1, String arg3) {
18341834
public static void spawnGroundItem(int arg1, int arg2) {
18351835
LinkedList linkedList = groundItems[Player.worldLevel][arg2][arg1];
18361836
if(linkedList == null)
1837-
Game.currentScene.method125(Player.worldLevel, arg2, arg1);
1837+
Game.currentScene.removeGroundItems(Player.worldLevel, arg2, arg1);
18381838
else {
18391839
int i = -99999999;
18401840
Item item = null;
@@ -1849,7 +1849,7 @@ public static void spawnGroundItem(int arg1, int arg2) {
18491849
}
18501850
}
18511851
if(item == null)
1852-
Game.currentScene.method125(Player.worldLevel, arg2, arg1);
1852+
Game.currentScene.removeGroundItems(Player.worldLevel, arg2, arg1);
18531853
else {
18541854
Item item_34_ = null;
18551855
Item item_35_ = null;

src/main/java/org/runejs/client/cache/media/gameInterface/GameInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,9 +1253,9 @@ public static void processMenuActions(int arg1) {
12531253
}
12541254
if(action == ActionRowType.WALK_HERE.getId()) {
12551255
if(MovedStatics.menuOpen) {
1256-
Game.currentScene.method120(-4 + i, -4 + i_10_);
1256+
Game.currentScene.click(-4 + i, -4 + i_10_);
12571257
} else {
1258-
Game.currentScene.method120(MouseHandler.clickX - 4, -4 + MouseHandler.clickY);
1258+
Game.currentScene.click(MouseHandler.clickX - 4, -4 + MouseHandler.clickY);
12591259
}
12601260
}
12611261
if(action == ActionRowType.EXAMINE_ITEM_ON_V1_WIDGET.getId()) {

src/main/java/org/runejs/client/frame/Minimap.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,9 @@ public static void method299(int arg1) {
352352
int i_2_ = 24628 + (-(512 * i_1_) + 52736) * 4;
353353
for(int i_3_ = 1; i_3_ < 103; i_3_++) {
354354
if((0x18 & MovedStatics.tile_flags[arg1][i_3_][i_1_]) == 0)
355-
Game.currentScene.method96(is, i_2_, 512, arg1, i_3_, i_1_);
355+
Game.currentScene.drawMinimapTile(is, i_2_, 512, arg1, i_3_, i_1_);
356356
if(arg1 < 3 && (MovedStatics.tile_flags[1 + arg1][i_3_][i_1_] & 0x8) != 0)
357-
Game.currentScene.method96(is, i_2_, 512, 1 + arg1, i_3_, i_1_);
357+
Game.currentScene.drawMinimapTile(is, i_2_, 512, 1 + arg1, i_3_, i_1_);
358358
i_2_ += 4;
359359
}
360360
}

src/main/java/org/runejs/client/message/handler/rs435/world/object/RotateAnimateObjectMessageHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void handle(RotateAnimateObjectInboundMessage message) {
2929
int tileHeightX1Y1 = Landscape.tile_height[Player.worldLevel][1 + x][1 + y];
3030
int tileHeightX0Y1 = Landscape.tile_height[Player.worldLevel][x][y + 1];
3131
if (objectType == 0) {
32-
Wall wall = Game.currentScene.method126(Player.worldLevel, x, y);
32+
Wall wall = Game.currentScene.getWall(Player.worldLevel, x, y);
3333
if (wall != null) {
3434
int i_11_ = 0x7fff & wall.hash >> 14;
3535
if (objectTypeKey == 2) {
@@ -45,7 +45,7 @@ public void handle(RotateAnimateObjectInboundMessage message) {
4545
wallDecoration.renderable = new GameObject((0x1fffe268 & wallDecoration.hash) >> 14, 4, 0, tileHeightX0Y0, tileHeightX1Y0, tileHeightX1Y1, tileHeightX0Y1, animationId, false);
4646
}
4747
if (objectType == 2) {
48-
InteractiveObject interactiveObject = Game.currentScene.method107(Player.worldLevel, x, y);
48+
InteractiveObject interactiveObject = Game.currentScene.getObject(Player.worldLevel, x, y);
4949
if (objectTypeKey == 11)
5050
objectTypeKey = 10;
5151
if (interactiveObject != null)

0 commit comments

Comments
 (0)