aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormogguh <mogguh@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-04-17 21:19:31 +0000
committermogguh <mogguh@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-04-17 21:19:31 +0000
commit1c5357580b64fb3573728803e11b769cecb5f45a (patch)
tree87c03a241741744a3d183a8abfb8f5c535625e83
parent7cbb58f6fe6cd8d81e21d6e0b1ebdc2fd872b773 (diff)
downloadusdx-1c5357580b64fb3573728803e11b769cecb5f45a.tar.gz
usdx-1c5357580b64fb3573728803e11b769cecb5f45a.tar.xz
usdx-1c5357580b64fb3573728803e11b769cecb5f45a.zip
Bugfix: Scores where not shown correctly when in 4 or 6 player mode (UScreenScore.pas), some more effort should be needed to draw the score bars in this mode correctly (but not now)
Theme/Skin: Playerboxes in score screen are now draw in player color (just affected the 4 and 6 player mode) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@110 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/Screens/UScreenScore.pas19
-rw-r--r--Themes/Deluxe.ini24
2 files changed, 29 insertions, 14 deletions
diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas
index 2c018b96..72c42cb8 100644
--- a/Game/Code/Screens/UScreenScore.pas
+++ b/Game/Code/Screens/UScreenScore.pas
@@ -574,8 +574,23 @@ begin
while (Length(S)<4) do S := '0' + S;
Text[TextNotesScore[Item]].Text := S;
- while (Length(S)<5) do S := '0' + S;
- Text[TextTotalScore[Item]].Text := S;
+// while (Length(S)<5) do S := '0' + S;
+// Text[TextTotalScore[Item]].Text := S;
+
+//fixed: line bonus and golden notes don't show up,
+// another bug: total score was shown without added golden-, linebonus
+ S := IntToStr(Player[P].ScoreTotalI);
+ while (Length(S)<5) do S := '0' + S;
+ Text[TextTotalScore[Item]].Text := S;
+
+ S := IntToStr(Player[P].ScoreLineI);
+ while (Length(S)<4) do S := '0' + S;
+ Text[TextLineBonusScore[Item]].Text := S;
+
+ S := IntToStr(Player[P].ScoreGoldenI);
+ while (Length(S)<4) do S := '0' + S;
+ Text[TextGoldenNotesScore[Item]].Text := S;
+//end of fix
LoadColor(
Text[TextName[Item]].ColR,
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index ae0ad67c..3ecfe5ff 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -1120,7 +1120,7 @@ H =4
Type =Font Black
Color =White
-[ScorePlayer1Static6]
+[ScoreStaticBoxDark1]
Tex =PlayerNumberBox
X =150
Y =467
@@ -1201,7 +1201,7 @@ TexY1=0
TexX2=1
TexY2=1
-[ScorePlayer1Static7]
+[ScorePlayer1Static6]
Tex =ScoreEndCap
X =469
Y =460
@@ -1216,7 +1216,7 @@ TexY2=1
Reflection=1
ReflectionSpacing=4
-[ScorePlayer1Static8]
+[ScorePlayer1Static7]
Tex =ScoreLine
X =468
Y =460
@@ -1369,7 +1369,7 @@ H =4
Type =Font Black
Color =White
-[ScorePlayer2Static6]
+[ScoreStaticBoxDark2]
Tex =PlayerNumberBox
X =20
Y =467
@@ -1446,7 +1446,7 @@ TexY1=0
TexX2=0
TexY2=0.5
-[ScorePlayer2Static7]
+[ScorePlayer2Static6]
Tex =ScoreEndCap
X =308
Y =460
@@ -1461,7 +1461,7 @@ TexY2=1
Reflection=1
ReflectionSpacing=4
-[ScorePlayer2Static8]
+[ScorePlayer2Static7]
Tex =ScoreLine
X =307
Y =460
@@ -1616,7 +1616,7 @@ H =4
Type =Font Black
Color =White
-[ScorePlayer3Static6]
+[ScoreStaticBoxDark3]
Tex =PlayerNumberBox
X =755
Y =467
@@ -1697,7 +1697,7 @@ TexY1=0
TexX2=1
TexY2=0.5
-[ScorePlayer3Static7]
+[ScorePlayer3Static6]
Tex =ScoreEndCap
X =402
Y =460
@@ -1712,7 +1712,7 @@ TexY2=1
Reflection=1
ReflectionSpacing=4
-[ScorePlayer3Static8]
+[ScorePlayer3Static7]
Tex =ScoreLine
X =401
Y =460
@@ -1818,7 +1818,7 @@ Align=2
Text=00000
Color=White
-[ScorePlayer4Static6]
+[ScoreStaticBoxDark4]
Tex =PlayerNumberBox
X =20
Y =370
@@ -1979,7 +1979,7 @@ Align=2
Text=00000
Color=White
-[ScorePlayer5Static6]
+[ScoreStaticBoxDark5]
Tex =PlayerNumberBox
X =280
Y =370
@@ -2139,7 +2139,7 @@ Align=2
Text=00000
Color=White
-[ScorePlayer6Static6]
+[ScoreStaticBoxDark6]
Tex =PlayerNumberBox
X =540
Y =370