aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-02-23 23:40:22 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-02-23 23:40:22 +0000
commit56d8cca83d92cfbfde7c6c295027d254610329bb (patch)
tree333caee77f3390246df2156a320f5b6fafa7ed6c
parentd8065f7bbda6bf97b6bca621b8cba39663c4fcd7 (diff)
downloadusdx-56d8cca83d92cfbfde7c6c295027d254610329bb.tar.gz
usdx-56d8cca83d92cfbfde7c6c295027d254610329bb.tar.xz
usdx-56d8cca83d92cfbfde7c6c295027d254610329bb.zip
serious code change. First trial to fix the score calculations. Please test
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1604 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/base/UMain.pas6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/base/UMain.pas b/src/base/UMain.pas
index 66a0823b..5e346456 100644
--- a/src/base/UMain.pas
+++ b/src/base/UMain.pas
@@ -829,7 +829,11 @@ var
NoteHit: boolean;
MaxSongPoints: integer; // max. points for the song (without line bonus)
MaxLinePoints: real; // max. points for the current line
+ ScoreFactor: array[TNoteType] of integer;
begin
+ ScoreFactor[ntFreestyle] := 0;
+ ScoreFactor[ntNormal] := 1;
+ ScoreFactor[ntGolden] := 2;
// TODO: add duet mode support
// use Lines[LineSetIndex] with LineSetIndex depending on the current player
@@ -931,7 +935,7 @@ begin
MaxSongPoints := MAX_SONG_SCORE;
// Note: ScoreValue is the sum of all note values of the song
- MaxLinePoints := MaxSongPoints / Lines[0].ScoreValue;
+ MaxLinePoints := MaxSongPoints / Lines[0].ScoreValue * ScoreFactor[CurrentLineFragment.NoteType];
// FIXME: is this correct? Why do we add the points for a whole line
// if just one note is correct?