diff options
author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-02-28 20:56:12 +0000 |
---|---|---|
committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-02-28 20:56:12 +0000 |
commit | 8f2fc12d58f248a7b548c4919c640500c7a4524d (patch) | |
tree | 68548fb01c7aab766a61c4fd501fd33ca0253c2b /src/base/UMusic.pas | |
parent | 10181f2a4db7b9f6a27e6343ac33c69562684623 (diff) | |
download | usdx-8f2fc12d58f248a7b548c4919c640500c7a4524d.tar.gz usdx-8f2fc12d58f248a7b548c4919c640500c7a4524d.tar.xz usdx-8f2fc12d58f248a7b548c4919c640500c7a4524d.zip |
Some cleanup done
moved ScoreFactor to UMusic
removed unused field TLines.LyricWidth
removed unused field TSong.Category
removed some weird and useless code from songloading procedures
songloading simplified, commented parts that are difficult to understand
some changes to score calculation that assure not more nor less than 10000 Points are gainable.
after many tests I could not find any bug in score calculation, at least after these changes.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1610 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | src/base/UMusic.pas | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/base/UMusic.pas b/src/base/UMusic.pas index 10f789d7..09d73331 100644 --- a/src/base/UMusic.pas +++ b/src/base/UMusic.pas @@ -39,8 +39,13 @@ uses Classes; type - TNoteType = (ntFreestyle, ntNormal, ntGolden); + TNoteType = (ntFreestyle = 0, ntNormal = 1, ntGolden = 2); +const + //Score Factor + ScoreFactor: array[TNoteType] of integer = (0, 1, 2); + +type (** * TLineFragment represents a fragment of a lyrics line. * This is a text-fragment (e.g. a syllable) assigned to a note pitch, @@ -64,7 +69,7 @@ type TLine = record Start: integer; // the start beat of this line (<> start beat of the first note of this line) Lyric: string; - LyricWidth: real; // @deprecated: width of the line in pixels. + //LyricWidth: real; // @deprecated: width of the line in pixels. // Do not use this as the width is not correct. // Use TLyricsEngine.GetUpperLine().Width instead. End_: integer; @@ -82,7 +87,7 @@ type *) TLines = record Current: integer; // for drawing of current line - High: integer; // (= High(Line)?) + High: integer; // = High(Line)! Number: integer; Resolution: integer; NotesGAP: integer; |