merge the first part of the medley_new branch. This part has the functionality and most GUI changes.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2943 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 30 insertions, 14 deletions

diff --git a/src/base/UNote.pas b/src/base/UNote.pas
index 2d71fb67..b9e71ac2 100644
--- a/src/base/UNote.pas
+++ b/src/base/UNote.pas
@@ -37,16 +37,15 @@ uses
   SysUtils,

   Classes,

   SDL,

-  UMusic,

-  URecord,

-  UTime,

+  gl,

   UDisplay,

   UIni,

   ULog,

   ULyrics,

+  URecord,

   UScreenSing,

   USong,

-  gl;

+  UTime;

 

 type

   PPLayerNote = ^TPlayerNote;

@@ -88,6 +87,21 @@ type
     Note:           array of TPlayerNote;

   end;

 

+  TStats = record

+    Player:     array of TPlayer;

+    SongArtist: string;

+    SongTitle:  string;

+  end;

+

+  TMedleyPlaylist = record

+    Song:              array of integer;

+    NumMedleySongs:    integer;

+    CurrentMedleySong: integer;

+    ApplausePlayed:    boolean;

+    Stats:             array of TStats;

+    NumPlayer:         integer;

+  end;

+

 {* Player and music info *}

 var

   {**

@@ -107,6 +121,8 @@ var
    *}

   CurrentSong: TSong;

 

+  PlaylistMedley: TMedleyPlaylist;  // playlist medley

+

 const

   MAX_SONG_SCORE = 10000;     // max. achievable points per song

   MAX_SONG_LINE_BONUS = 1000; // max. achievable line bonus per song

@@ -124,23 +140,23 @@ implementation
 uses

   Math,

   StrUtils,

-  USongs,

-  UJoystick,

+  UCatCovers,

   UCommandLine,

-  ULanguage,

-  //SDL_ttf,

-  USkins,

+  UCommon,

+  UConfig,

   UCovers,

-  UCatCovers,

   UDataBase,

-  UPlaylist,

-  UParty,

-  UConfig,

-  UCommon,

   UGraphic,

   UGraphicClasses,

+  UJoystick,

+  ULanguage,

+  UMusic,

+  UParty,

   UPathUtils,

   UPlatform,

+  UPlaylist,

+  USkins,

+  USongs,

   UThemes;

 

 function GetTimeForBeats(BPM, Beats: real): real;