Merge pull request #191 from runejs/minimap

refactor: refactoring around minimap/frame drawing

Author: Promises

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

@@ -644,7 +644,7 @@ public static void setConfigToDefaults() {
             ChatBox.chatMessages[i] = null;
         GameInterface.itemCurrentlySelected = 0;
         MovedStatics.destinationX = 0;
-        MovedStatics.anInt1985 = -1;
+        Minimap.minimapLevel = -1;
         Player.npcCount = 0;
         SoundSystem.reset();
         widgetSelected = 0;
@@ -937,17 +937,37 @@ public static void drawGameScreen() {
                 ChatBox.redrawChatbox = true;
             }
         }
+
+        if(GameInterface.tabAreaInterfaceId != -1) {
+            boolean bool = GameInterface.handleSequences(GameInterface.tabAreaInterfaceId);
+            if(bool) {
+                GameInterface.redrawTabArea = true;
+            }
+        }
+
+        if(GameInterface.chatboxInterfaceId != -1) {
+            boolean bool = GameInterface.handleSequences(GameInterface.chatboxInterfaceId);
+            if(bool) {
+                ChatBox.redrawChatbox = true;
+            }
+        }
+
+        if(ChatBox.dialogueId != -1) {
+            boolean bool = GameInterface.handleSequences(ChatBox.dialogueId);
+            if(bool) {
+                ChatBox.redrawChatbox = true;
+            }
+        }
+        
+        if(flashingTabId != -1) {
+            GameInterface.drawTabIcons = true;
+        }
+
         if(ScreenController.frameMode == ScreenMode.FIXED) {
 
             if(MovedStatics.menuOpen && MovedStatics.menuScreenArea == 1) {
                 GameInterface.redrawTabArea = true;
             }
-            if(GameInterface.tabAreaInterfaceId != -1) {
-                boolean bool = GameInterface.handleSequences(GameInterface.tabAreaInterfaceId);
-                if(bool) {
-                    GameInterface.redrawTabArea = true;
-                }
-            }
             method353();
 
             if(GameInterface.atInventoryInterfaceType == -3) {
@@ -958,18 +978,6 @@ public static void drawGameScreen() {
             }
             MovedStatics.drawTabArea();
 
-            if(GameInterface.chatboxInterfaceId != -1) {
-                boolean bool = GameInterface.handleSequences(GameInterface.chatboxInterfaceId);
-                if(bool) {
-                    ChatBox.redrawChatbox = true;
-                }
-            }
-            if(ChatBox.dialogueId != -1) {
-                boolean bool = GameInterface.handleSequences(ChatBox.dialogueId);
-                if(bool) {
-                    ChatBox.redrawChatbox = true;
-                }
-            }
             if(GameInterface.atInventoryInterfaceType == 3) {
                 ChatBox.redrawChatbox = true;
             }
@@ -990,10 +998,6 @@ public static void drawGameScreen() {
 
             Minimap.renderMinimap();
 
-
-            if(flashingTabId != -1) {
-                GameInterface.drawTabIcons = true;
-            }
             if(GameInterface.drawTabIcons) {
                 if(flashingTabId != -1 && flashingTabId == currentTabId) {
                     flashingTabId = -1;
@@ -1013,30 +1017,14 @@ public static void drawGameScreen() {
             MovedStatics.anInt199 = 0;
 
         } else {
-
-
-            if(GameInterface.tabAreaInterfaceId != -1) {
-                GameInterface.handleSequences(GameInterface.tabAreaInterfaceId);
-            }
-
-            if(GameInterface.chatboxInterfaceId != -1) {
-                GameInterface.handleSequences(GameInterface.chatboxInterfaceId);
-            }
-
-            if(ChatBox.dialogueId != -1) {
-                GameInterface.handleSequences(ChatBox.dialogueId);
-            }
             method353();
             ChatBox.renderChatbox();
 
             MovedStatics.drawTabArea();
 
-            Minimap.renderMinimap();
-
+            // this render is  handled in `ResizableFrameRenderer`
+            //Minimap.renderMinimap();
 
-            if(flashingTabId != -1) {
-                GameInterface.drawTabIcons = true;
-            }
             if(GameInterface.drawTabIcons) {
                 if(flashingTabId != -1 && flashingTabId == currentTabId) {
                     flashingTabId = -1;
@@ -1920,9 +1908,9 @@ public static void method910() {
         if(true) {
             if (VertexNormal.lowMemory && MovedStatics.onBuildTimePlane != Player.worldLevel)
                 MovedStatics.method789(Player.localPlayer.pathY[0], MovedStatics.regionY, MovedStatics.regionX, Player.localPlayer.pathX[0], Player.worldLevel);
-            else if (MovedStatics.anInt1985 != Player.worldLevel) {
-                MovedStatics.anInt1985 = Player.worldLevel;
-                Minimap.method299(Player.worldLevel);
+            else if (Minimap.minimapLevel != Player.worldLevel) {
+                Minimap.minimapLevel = Player.worldLevel;
+                Minimap.createMinimap(Player.worldLevel);
             }
         }
     }

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

@@ -335,7 +335,6 @@ public class MovedStatics {
      */
     public static int anInt2480 = 0;
     public static ImageRGB[] aClass40_Sub5_Sub14_Sub4Array2474;
-    public static int anInt1985 = -1;
     public static int anInt1987 = 0;
     public static IndexedImage tabTopBack;
     /**
@@ -3734,7 +3733,7 @@ public static void method789(int chunkLocalX, int chunkY, int chunkX, int chunkL
                 if(obj.x < 0 || obj.y < 0 || obj.x >= 104 || obj.y >= 104)
                     obj.unlink();
             }
-            anInt1985 = -1;
+            Minimap.minimapLevel = -1;
             if(destinationX != 0) {
                 destinationX -= i_34_;
                 Game.destinationY -= i_35_;

src/main/java/org/runejs/client/cache/media/ImageRGB.java

@@ -782,7 +782,7 @@ public void method722(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5
         }
     }
 
-    public void method723() {
+    public void prepareRasterizer() {
         Rasterizer.prepare(pixels, imageWidth, imageHeight);
     }