diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-09 19:29:14 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-09 19:29:14 +0000 |
| commit | 665d1f930ea1f543f6c7b3a2fe6609735e8effb1 (patch) | |
| tree | 24e6ddff02c4f28ea95ce022b1317b501075f659 /Medley/src/base/UNote.pas | |
| parent | 5196a888b055b063868615d7d80cda3abdbb63b0 (diff) | |
| download | usdx-665d1f930ea1f543f6c7b3a2fe6609735e8effb1.tar.gz usdx-665d1f930ea1f543f6c7b3a2fe6609735e8effb1.tar.xz usdx-665d1f930ea1f543f6c7b3a2fe6609735e8effb1.zip | |
added medley code changes
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2013 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Medley/src/base/UNote.pas')
| -rw-r--r-- | Medley/src/base/UNote.pas | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/Medley/src/base/UNote.pas b/Medley/src/base/UNote.pas index 8e5b709a..bc91c892 100644 --- a/Medley/src/base/UNote.pas +++ b/Medley/src/base/UNote.pas @@ -88,13 +88,30 @@ type Note: array of TPlayerNote; end; + TStats = record + Player: array of TPlayer; + SongArtist: UTF8String; + SongTitle: UTF8String; + end; + + TMedleyPlaylist = record + Song: array of integer; + NumMedleySongs: integer; + CurrentMedleySong: integer; + ApplausePlayed: boolean; + Stats: array of TStats; + NumPlayer: integer; + end; + var // player and music info Player: array of TPlayer; PlayersPlay: integer; - + PlaylistMedley: TMedleyPlaylist; CurrentSong: TSong; + max_song_score_medley: integer; + max_song_line_bonus_medley: integer; const MAX_SONG_SCORE = 10000; // max. achievable points per song @@ -463,10 +480,19 @@ begin // half size notes patch NoteHit := true; - if (Ini.LineBonus > 0) then - MaxSongPoints := MAX_SONG_SCORE - MAX_SONG_LINE_BONUS - else - MaxSongPoints := MAX_SONG_SCORE; + if ScreenSong.Mode <> smMedley then + begin + if (Ini.LineBonus > 0) then + MaxSongPoints := MAX_SONG_SCORE - MAX_SONG_LINE_BONUS + else + MaxSongPoints := MAX_SONG_SCORE; + end else + begin + if (Ini.LineBonus > 0) then + MaxSongPoints := max_song_score_medley - max_song_line_bonus_medley + else + MaxSongPoints := max_song_score_medley; + end; // Note: ScoreValue is the sum of all note values of the song // (MaxSongPoints / ScoreValue) is the points that a player |