refactor: rename chat countdown

Author: Jameskmonger

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

@@ -1302,7 +1302,7 @@ else if(x > 764)
                     } else {
                         MovedStatics.animatePlayers(-1);
                         MovedStatics.animateNpcs();
-                        MovedStatics.method313();
+                        Actor.tickChatTimers();
                         if(MovedStatics.crossType != 0) {
                             MovedStatics.crossIndex += 20;
                             if(MovedStatics.crossIndex >= 400)

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

@@ -1504,31 +1504,7 @@ public static Point2d getScreenMidpoint() {
         }
     }
 
-	public static void method313() {
-	    for(int i = -1; Player.localPlayerCount > i; i++) {
-	        int i_6_;
-	        if(i == -1)
-	            i_6_ = 2047;
-	        else
-	            i_6_ = Player.trackedPlayerIndices[i];
-	        Player class40_sub5_sub17_sub4_sub1 = Player.trackedPlayers[i_6_];
-	        if(class40_sub5_sub17_sub4_sub1 != null && class40_sub5_sub17_sub4_sub1.anInt3078 > 0) {
-	            class40_sub5_sub17_sub4_sub1.anInt3078--;
-	            if(class40_sub5_sub17_sub4_sub1.anInt3078 == 0)
-	                class40_sub5_sub17_sub4_sub1.forcedChatMessage = null;
-	        }
-	    }
-	    for(int i_7_ = 0; i_7_ < Player.npcCount; i_7_++) {
-	        int i_8_ = Player.npcIds[i_7_];
-	        Npc class40_sub5_sub17_sub4_sub2 = Player.npcs[i_8_];
-	        if(class40_sub5_sub17_sub4_sub2 != null && class40_sub5_sub17_sub4_sub2.anInt3078 > 0) {
-	            class40_sub5_sub17_sub4_sub2.anInt3078--;
-	            if(class40_sub5_sub17_sub4_sub2.anInt3078 == 0)
-	                class40_sub5_sub17_sub4_sub2.forcedChatMessage = null;
-	        }
-	    }
-	}
-	public static int[] anIntArray1847 = new int[2000];
+    public static int[] anIntArray1847 = new int[2000];
 	public static long aLong1841;
 
     private static int interpolateForPerlin(int arg0, int arg1, int arg2, boolean arg3, int arg4) {
@@ -2709,7 +2685,7 @@ else if(i < Player.localPlayerCount)
                         PlayerAppearance.anIntArray685[SceneCluster.anInt770] = screenPos.y;
                         PlayerAppearance.overheadChatColor[SceneCluster.anInt770] = actor.chatcolor;
                         PlayerAppearance.overheadChatShape[SceneCluster.anInt770] = actor.chatEffects;
-                        PlayerAppearance.anIntArray684[SceneCluster.anInt770] = actor.anInt3078;
+                        PlayerAppearance.anIntArray684[SceneCluster.anInt770] = actor.chatTimer;
                         PlayerAppearance.overheadChatMessage[SceneCluster.anInt770] = actor.forcedChatMessage;
                         SceneCluster.anInt770++;
                     }

src/main/java/org/runejs/client/media/renderable/actor/Actor.java

@@ -12,7 +12,7 @@ public abstract class Actor extends Renderable {
     public int anInt3074;
     public int turnRightAnimationId;
     public int anInt3077;
-    public int anInt3078;
+    public int chatTimer;
     public int turnAroundAnimationId;
     public int initialFaceDirection;
     public int forceMoveStartY;
@@ -89,7 +89,7 @@ public Actor() {
         anInt3104 = 0;
         graphicId = -1;
         anInt3117 = 200;
-        anInt3078 = 100;
+        chatTimer = 100;
         anInt3120 = 0;
         playingAnimationDelay = 0;
         anInt3077 = -1;
@@ -354,6 +354,34 @@ public static void startForcedMovement(Actor actor) {
         actor.anInt3118 = actor.initialFaceDirection;
     }
 
+    /**
+     * Decrease the time remaining for all actor chats.
+     */
+	public static void tickChatTimers() {
+	    for(int i = -1; Player.localPlayerCount > i; i++) {
+	        int pid;
+	        if(i == -1)
+	            pid = 2047;
+	        else
+	            pid = Player.trackedPlayerIndices[i];
+	        Player player = Player.trackedPlayers[pid];
+	        if(player != null && player.chatTimer > 0) {
+	            player.chatTimer--;
+	            if(player.chatTimer == 0)
+	                player.forcedChatMessage = null;
+	        }
+	    }
+	    for(int i = 0; i < Player.npcCount; i++) {
+	        int nid = Player.npcIds[i];
+	        Npc npc = Player.npcs[nid];
+	        if(npc != null && npc.chatTimer > 0) {
+	            npc.chatTimer--;
+	            if(npc.chatTimer == 0)
+	                npc.forcedChatMessage = null;
+	        }
+	    }
+	}
+
     public void move(int moveDirection, boolean isRunning) {
         int i = pathY[0];
         int i_19_ = pathX[0];

src/main/java/org/runejs/client/media/renderable/actor/Npc.java

@@ -53,7 +53,7 @@ public static void parseNpcUpdateMasks(PacketBuffer buffer) {
             }
             if((0x40 & mask) != 0) {
                 npc.forcedChatMessage = buffer.getString();
-                npc.anInt3078 = 100;
+                npc.chatTimer = 100;
             }
             if((mask & 0x80) != 0) {
                 npc.actorDefinition = ActorDefinition.getDefinition(buffer.getUnsignedShortBE());

src/main/java/org/runejs/client/media/renderable/actor/Player.java

@@ -155,7 +155,7 @@ public static void parsePlayerUpdateMasks(PacketBuffer appearanceBuffer, Player
                     String incomming = MovedStatics.method956(appearanceBuffer);
                     String class1 = RSString.formatChatString(incomming);
                     player.forcedChatMessage = class1.trim();
-                    player.anInt3078 = 150;
+                    player.chatTimer = 150;
                     player.chatEffects = chatEffectsAndColors & 0xff;
                     player.chatcolor = chatEffectsAndColors >> 8;
                     if(playerRights == 2 || playerRights == 3)
@@ -195,7 +195,7 @@ else if(playerRights == 1)
                 ChatBox.addChatMessage(player.playerName, player.forcedChatMessage, 2);
             } else if(player == localPlayer)
                 ChatBox.addChatMessage(player.playerName, player.forcedChatMessage, 2);
-            player.anInt3078 = 150;
+            player.chatTimer = 150;
             player.chatcolor = 0;
             player.chatEffects = 0;
         }