From 159df0de7334d656f1a6fc0d2058ebc8c9edfeaa Mon Sep 17 00:00:00 2001
From: 0aubsq <0aubsq@gmail.com>
Date: Wed, 22 Dec 2021 04:33:42 +0100
Subject: [PATCH] Fix #111

---
 TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs | 5 +++--
 TJAPlayer3/Stages/08.Result/CStage結果.cs               | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs b/TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs
index 88099ba8..9f2b73ea 100644
--- a/TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs
+++ b/TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs
@@ -426,7 +426,8 @@ namespace TJAPlayer3
 							TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGreat.ToString(),
 							TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGood.ToString(),
 							TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMiss.ToString(),
-							TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nRoll.ToString(),
+							//TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nRoll.ToString(),
+							TJAPlayer3.stage演奏ドラム画面.GetRoll(i).ToString(),
 							TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[i].ToString()
 						};
 
@@ -462,7 +463,7 @@ namespace TJAPlayer3
 							TJAPlayer3.Tx.Result_Score_Number.vc拡大縮小倍率.Y = ct全体進行.n現在の値 <= AnimeCount1 + 270 ? 1.0f + (float)Math.Sin((ct全体進行.n現在の値 - AnimeCount1) / 1.5f * (Math.PI / 180)) * 0.65f :
 																			  ct全体進行.n現在の値 <= AnimeCount1 + 360 ? 1.0f - (float)Math.Sin((ct全体進行.n現在の値 - AnimeCount1 - 270) * (Math.PI / 180)) * 0.1f : 1.0f;
 
-							this.tスコア文字表示(TJAPlayer3.Skin.nResultScoreP1X + totalShift, TJAPlayer3.Skin.nResultScoreP1Y, string.Format("{0,7:######0}", TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nScore.ToString()));
+							this.tスコア文字表示(TJAPlayer3.Skin.nResultScoreP1X + totalShift, TJAPlayer3.Skin.nResultScoreP1Y, string.Format("{0,7:######0}", TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, i).ToString()));// TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nScore.ToString()));
 
 							if (!b音声再生[6])
 							{
diff --git a/TJAPlayer3/Stages/08.Result/CStage結果.cs b/TJAPlayer3/Stages/08.Result/CStage結果.cs
index a3e3bb6b..bedcfdaa 100644
--- a/TJAPlayer3/Stages/08.Result/CStage結果.cs
+++ b/TJAPlayer3/Stages/08.Result/CStage結果.cs
@@ -150,7 +150,7 @@ namespace TJAPlayer3
 								? 1 
 								: 0;
 
-							if (ccf.nScore < 500000)
+							if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, p) < 500000)
 							{
 								this.nスコアランク[p] = 0;
 							}
@@ -160,7 +160,7 @@ namespace TJAPlayer3
 
 								for (int i = 0; i < 7; i++)
 								{
-									if (ccf.nScore >= sr[i])
+									if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, p) >= sr[i])
 									{
 										this.nスコアランク[p] = i + 1;
 									}
@@ -242,7 +242,7 @@ namespace TJAPlayer3
 
 							var clear = Math.Max(ini[i].stセクション[0].nクリア[diff], this.nクリア[i]);
 							var scoreRank = Math.Max(ini[i].stセクション[0].nスコアランク[diff], this.nスコアランク[i]);
-							var highscore = Math.Max(ini[i].stセクション[0].nハイスコア[diff], ccf.nScore);
+							var highscore = Math.Max(ini[i].stセクション[0].nハイスコア[diff], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, i));
 
 							if (isAutoDisabled(i))
 							{