aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-09-28 19:17:48 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-09-28 19:17:48 +0000
commit5a237b4a0da9b4058e08b0db1a46e4c66277ede4 (patch)
tree3f6086b8d50ce30d2470f94d810c375556bbd4e3
parent276411ffc65aa73fce9fdc1bec7555d6df76357c (diff)
downloadusdx-5a237b4a0da9b4058e08b0db1a46e4c66277ede4.tar.gz
usdx-5a237b4a0da9b4058e08b0db1a46e4c66277ede4.tar.xz
usdx-5a237b4a0da9b4058e08b0db1a46e4c66277ede4.zip
Fixed effects from last song are drawn in next song, see http://www.assembla.com/spaces/usdx/tickets/23
ClearScores method updated: this fixes that first sentence of song is awful if a song was sung before git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1426 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/base/UMain.pas17
-rw-r--r--src/screens/UScreenSing.pas3
2 files changed, 14 insertions, 6 deletions
diff --git a/src/base/UMain.pas b/src/base/UMain.pas
index 0c86563d..f9ac4ebe 100644
--- a/src/base/UMain.pas
+++ b/src/base/UMain.pas
@@ -1013,13 +1013,18 @@ procedure ClearScores(PlayerNum: integer);
begin
with Player[PlayerNum] do
begin
- Score := 0;
- ScoreInt := 0;
- ScoreLine := 0;
- ScoreLineInt := 0;
- ScoreGolden := 0;
- ScoreGoldenInt := 0;
+ Score := 0;
+ ScoreLine := 0;
+ ScoreGolden := 0;
+
+ ScoreInt := 0;
+ ScoreLineInt := 0;
+ ScoreGoldenInt:= 0;
ScoreTotalInt := 0;
+
+ ScoreLast := 0;
+
+ LastSentencePerfect := False;
end;
end;
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas
index 1aa9dcde..3eb3742d 100644
--- a/src/screens/UScreenSing.pas
+++ b/src/screens/UScreenSing.pas
@@ -844,6 +844,9 @@ begin
// to prevent drawing closed video
VideoLoaded := False;
+
+ //Kill all Stars and Effects
+ GoldenRec.KillAll;
if (Ini.SavePlayback = 1) then
begin