clicking on labelRank leads to a crash

KoloInDaCrib · Nov 20, 2024 · aa11de5 · aa11de5
1 parent 67c7f2a
commit aa11de5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/source/funkin/ui/debug/char/components/dialogs/ResultsAnimDialog.hx b/source/funkin/ui/debug/char/components/dialogs/ResultsAnimDialog.hx
@@ -68,16 +68,9 @@ class ResultsAnimDialog extends DefaultPageDialog
     rankDropdown.onChange = function(_) {
       if (previousRank == currentRank) return;
 
-      updateRankAnimations(previousRank);
+      changeRankPreview();
 
-      for (atlas in characterAtlasAnimationsMap[previousRank])
-        atlas.sprite.visible = false;
-
-      for (sprite in characterSparrowAnimationsMap[previousRank])
-        sprite.sprite.visible = false;
-
-      rankAnimationBox.useAnimationData(rankAnimationDataMap[currentRank]);
-      previousRank = currentRank;
+      daPage.labelRank.text = currentRankText;
 
       daPage.playAnimation();
     }
@@ -86,6 +79,20 @@ class ResultsAnimDialog extends DefaultPageDialog
     previousRank = currentRank;
   }
 
+  public function changeRankPreview():Void
+  {
+    updateRankAnimations(previousRank);
+
+    for (atlas in characterAtlasAnimationsMap[previousRank])
+      atlas.sprite.visible = false;
+
+    for (sprite in characterSparrowAnimationsMap[previousRank])
+      sprite.sprite.visible = false;
+
+    rankAnimationBox.useAnimationData(rankAnimationDataMap[currentRank]);
+    previousRank = currentRank;
+  }
+
   function updateRankAnimations(rank:ScoringRank):Void
   {
     var parentList = rankAnimationBox.parentComponent;

diff --git a/source/funkin/ui/debug/char/pages/CharCreatorResultsPage.hx b/source/funkin/ui/debug/char/pages/CharCreatorResultsPage.hx
@@ -106,6 +106,8 @@ class CharCreatorResultsPage extends CharCreatorDefaultPage
       var id = drop.selectedIndex + 1;
       if (id >= drop.dataSource.size) id = 0;
       drop.selectedIndex = id;
+
+      rankAnimDialog.changeRankPreview();
       playAnimation();
     }
 
@@ -114,8 +116,10 @@ class CharCreatorResultsPage extends CharCreatorDefaultPage
       if (drop.selectedIndex == -1) return;
 
       var id = drop.selectedIndex - 1;
-      if (id < 0) id = drop.dataSource.size;
+      if (id < 0) id = drop.dataSource.size - 1;
       drop.selectedIndex = id;
+
+      rankAnimDialog.changeRankPreview();
       playAnimation();
     }
   }