rewriting of the txt file parser

removed unused variables from TLines and TLine, removed TMelody
overworked the TLines and TLine records 


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

1 files changed, 3 insertions, 18 deletions

diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas
index c4123dd0..c389574b 100644
--- a/Game/Code/Classes/UMusic.pas
+++ b/Game/Code/Classes/UMusic.pas
@@ -14,19 +14,9 @@ uses
 type
   TNoteType = (ntFreestyle, ntNormal, ntGolden);
 
-  //http://paste.ubuntu-nl.org/51892/
-
-  TMelody = record
-    Path:       string;
-    Start:      integer;      // start of song in ms
-    IlNut:      integer;      // (TODO: Il = tone, Nut(a) = Note)
-    NoteLength: integer;
-  end;
-
   PLine = ^TLine;
   TLine = record
     Start:      integer;
-    StartNote:  integer;
     Lyric:      string;
     LyricWidth: real;
     End_:       integer;
@@ -40,10 +30,8 @@ type
       Start:      integer;
       Length:     integer;
       Tone:       integer;    // full range tone
-      ToneGamus:  integer;    // tone unified to one octave
       Text:       string;
-      FreeStyle:  boolean;
-      NoteType:   integer;    // normal-note: 1, golden-note: 2
+      NoteType:   TNoteType;
     end;
   end;
   ALine = array of TLine;     // (TODO: rename to TLineArray)
@@ -52,10 +40,10 @@ type
   TLines = record
     Current:    integer;      // for drawing of current line
     High:       integer;
-    Number:      integer;
+    Number:     integer;
     Resolution: integer;
     NotesGAP:   integer;
-    NoteType:   integer;
+    ScoreValue: integer;
     Line:       ALine;
   end;
 
@@ -288,9 +276,6 @@ type
   end;
 
 var // TODO : JB --- THESE SHOULD NOT BE GLOBAL
-  // music
-  Melody:   TMelody;
-
   // czesci z nutami;
   Lines:   array of TLines;