Use customized border colour for experimental sliders

CloneWith · Jul 27, 2024 · c0eeaac · c0eeaac
1 parent 1f91324
commit c0eeaac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java
@@ -1009,6 +1009,7 @@ public void drawRankingElements(Graphics g, Beatmap beatmap, int time) {
 	 */
 	public void drawHitResults(int trackPosition, boolean over) {
 		Iterator<HitObjectResult> iter = hitResultList.iterator();
+		// TODO: Scale result images based on CS
 		while (iter.hasNext()) {
 			HitObjectResult hitResult = iter.next();
 			if (hitResult.time + HITRESULT_TIME > trackPosition) {

diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
@@ -1685,7 +1685,8 @@ private void drawHitObjects(Graphics g, int trackPosition) {
 
 		// draw merged slider
 		if (!loseState && !GameMod.CINEMA.isActive() && mergedSlider != null && Options.isExperimentalSliderMerging()) {
-			mergedSlider.draw(Color.white);
+			mergedSlider.draw(Options.isBeatmapSkinIgnored() ?
+				Options.getSkin().getSliderBorderColor() : beatmap.getSliderBorderColor());
 			mergedSlider.clearPoints();
 		}