From e80ec1918ada3406d9e7cdd6a27b259dfa3bfc3d Mon Sep 17 00:00:00 2001 From: f1fth_freed0m Date: Thu, 6 Mar 2008 01:26:21 +0000 Subject: Translated so Variable Names Koniec to End_ Wartosc to NoteType Dlugosc to Lenght Ton to Tone Tekst to Text git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@915 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UDraw.pas | 42 ++++---- Game/Code/Classes/UFiles.pas | 4 +- Game/Code/Classes/ULyrics.pas | 6 +- Game/Code/Classes/ULyrics_bak.pas | 4 +- Game/Code/Classes/UMain.pas | 66 ++++++------ Game/Code/Classes/UMusic.pas | 12 +-- Game/Code/Classes/USong.pas | 30 +++--- Game/Code/Screens/UScreenEditConvert.pas | 22 ++-- Game/Code/Screens/UScreenEditSub.pas | 170 +++++++++++++++---------------- Game/Code/Screens/UScreenSing.pas | 2 +- Game/Code/Screens/UScreenSingModi.pas | 10 +- 11 files changed, 184 insertions(+), 184 deletions(-) (limited to 'Game') diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas index 986c3ea8..8c4f53f3 100644 --- a/Game/Code/Classes/UDraw.pas +++ b/Game/Code/Classes/UDraw.pas @@ -202,10 +202,10 @@ var Pet: integer; TempR: real; begin - TempR := (Right-Left) / (Lines[NrCzesci].Line[Lines[NrCzesci].Akt].Koniec - Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote); + TempR := (Right-Left) / (Lines[NrCzesci].Line[Lines[NrCzesci].Akt].End_ - Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote); glEnable(GL_BLEND); glBegin(GL_LINES); - for Pet := Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote to Lines[NrCzesci].Line[Lines[NrCzesci].Akt].Koniec do begin + for Pet := Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote to Lines[NrCzesci].Line[Lines[NrCzesci].Akt].End_ do begin if (Pet mod Lines[NrCzesci].Resolution) = Lines[NrCzesci].NotesGAP then glColor4f(0, 0, 0, 1) else @@ -248,7 +248,7 @@ begin glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); lTmpA := (Right-Left); - lTmpB := (Lines[NrCzesci].Line[Lines[NrCzesci].Akt].Koniec - Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote); + lTmpB := (Lines[NrCzesci].Line[Lines[NrCzesci].Akt].End_ - Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote); {$IFDEF LAZARUS} (* @@ -278,18 +278,18 @@ begin if Ini.EffectSing = 0 then // If Golden note Effect of then Change not Color begin - case Wartosc of + case NoteType of 1: glColor4f(1, 1, 1, 1); // We set alpha to 1, cause we can control the transparency through the png itself 2: glColor4f(1, 1, 0.3, 1); // no stars, paint yellow -> glColor4f(1, 1, 0.3, 0.85); - we could end; // case end //Else all Notes same Color else glColor4f(1, 1, 1, 1); // We set alpha to 1, cause we can control the transparency through the png itself - // Czesci == teil, element == piece, element | koniec == ende, schluss + // Czesci == teil, element == piece, element | koniec == end / ending // lewa czesc - left part Rec.Left := (Start-Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote) * TempR + Left + 0.5 + 10*ScreenX; Rec.Right := Rec.Left + NotesW; - Rec.Top := Top - (Ton-BaseNote)*Space/2 - NotesH; + Rec.Top := Top - (Tone-BaseNote)*Space/2 - NotesH; Rec.Bottom := Rec.Top + 2 * NotesH; glBindTexture(GL_TEXTURE_2D, Tex_plain_Left[PlayerNumber].TexNum); glBegin(GL_QUADS); @@ -305,7 +305,7 @@ begin // srodkowa czesc - middle part Rec.Left := Rec.Right; - Rec.Right := (Start+Dlugosc-Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote) * TempR + Left - NotesW - 0.5 + 10*ScreenX; // Dlugosc == länge + Rec.Right := (Start+Lenght-Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote) * TempR + Left - NotesW - 0.5 + 10*ScreenX; // Dlugosc == lenght glBindTexture(GL_TEXTURE_2D, Tex_plain_Mid[PlayerNumber].TexNum); glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ); @@ -330,7 +330,7 @@ begin glEnd; // Golden Star Patch - if (Wartosc = 2) AND (Ini.EffectSing=1) then + if (NoteType = 2) AND (Ini.EffectSing=1) then begin GoldenRec.SaveGoldenStarsRec(GoldenStarPos, Rec.Top, Rec.Right, Rec.Bottom); end; @@ -373,7 +373,7 @@ var //// if Player[NrGracza].IlNut > 0 then begin - TempR := W / (Lines[0].Line[Lines[0].Akt].Koniec - Lines[0].Line[Lines[0].Akt].StartNote); + TempR := W / (Lines[0].Line[Lines[0].Akt].End_ - Lines[0].Line[Lines[0].Akt].StartNote); for N := 0 to Player[NrGracza].HighNut do begin with Player[NrGracza].Note[N] do @@ -392,7 +392,7 @@ var NotesH2 := int(NotesH * 0.65); end; - Rec.Top := Y - (Ton-Lines[0].Line[Lines[0].Akt].BaseNote)*Space/2 - NotesH2; + Rec.Top := Y - (Tone-Lines[0].Line[Lines[0].Akt].BaseNote)*Space/2 - NotesH2; Rec.Bottom := Rec.Top + 2 *NotesH2; // draw the left part @@ -407,10 +407,10 @@ var // Middle part of the note Rec.Left := Rec.Right; - Rec.Right := X + (Start+Dlugosc-Lines[0].Line[Lines[0].Akt].StartNote) * TempR - NotesW - 0.5 + 10*ScreenX; + Rec.Right := X + (Start+Lenght-Lines[0].Line[Lines[0].Akt].StartNote) * TempR - NotesW - 0.5 + 10*ScreenX; // (nowe) - dunno - if (Start+Dlugosc-1 = Czas.AktBeatD) then + if (Start+Lenght-1 = Czas.AktBeatD) then Rec.Right := Rec.Right - (1-Frac(Czas.MidBeatD)) * TempR; // the left note is more right than the right note itself, sounds weird - so we fix that xD if Rec.Right <= Rec.Left then Rec.Right := Rec.Left; @@ -442,8 +442,8 @@ var // Perfect note is stored if Perfect and (Ini.EffectSing=1) then begin - A := 1 - 2*(Czas.Teraz - GetTimeFromBeat(Start+Dlugosc)); - if not (Start+Dlugosc-1 = Czas.AktBeatD) then + A := 1 - 2*(Czas.Teraz - GetTimeFromBeat(Start+Lenght)); + if not (Start+Lenght-1 = Czas.AktBeatD) then //Star animation counter //inc(Starfr); @@ -484,7 +484,7 @@ begin lTmpA := (Right-Left); - lTmpB := (Lines[NrCzesci].Line[Lines[NrCzesci].Akt].Koniec - Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote); + lTmpB := (Lines[NrCzesci].Line[Lines[NrCzesci].Akt].End_ - Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote); if ( lTmpA > 0 ) AND @@ -509,13 +509,13 @@ begin X2 := (Start-Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote) * TempR + Left + 0.5 + 10*ScreenX + 4; // wciecie X1 := X2-W; - X3 := (Start+Dlugosc-Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote) * TempR + Left - 0.5 + 10*ScreenX - 4; // wciecie + X3 := (Start+Lenght-Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote) * TempR + Left - 0.5 + 10*ScreenX - 4; // wciecie X4 := X3+W; // left Rec.Left := X1; Rec.Right := X2; - Rec.Top := Top - (Ton-BaseNote)*Space/2 - H; + Rec.Top := Top - (Tone-BaseNote)*Space/2 - H; Rec.Bottom := Rec.Top + 2 * H; glBindTexture(GL_TEXTURE_2D, Tex_BG_Left[NrGracza+1].TexNum); @@ -1239,13 +1239,13 @@ begin glEnable(GL_TEXTURE_2D); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - TempR := (Right-Left) / (Lines[NrCzesci].Line[Lines[NrCzesci].Akt].Koniec - Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote); + TempR := (Right-Left) / (Lines[NrCzesci].Line[Lines[NrCzesci].Akt].End_ - Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote); with Lines[NrCzesci].Line[Lines[NrCzesci].Akt] do begin for Pet := 0 to HighNote do begin with Note[Pet] do begin // Golden Note Patch - case Wartosc of + case NoteType of 0: glColor4f(1, 1, 1, 0.35); 1: glColor4f(1, 1, 1, 0.85); 2: glColor4f(1, 1, 0.3, 0.85); @@ -1256,7 +1256,7 @@ begin // lewa czesc - left part Rec.Left := (Start-Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote) * TempR + Left + 0.5 + 10*ScreenX; Rec.Right := Rec.Left + NotesW; - Rec.Top := Top - (Ton-BaseNote)*Space/2 - NotesH; + Rec.Top := Top - (Tone-BaseNote)*Space/2 - NotesH; Rec.Bottom := Rec.Top + 2 * NotesH; glBindTexture(GL_TEXTURE_2D, Tex_Left[Color].TexNum); glBegin(GL_QUADS); @@ -1268,7 +1268,7 @@ begin // srodkowa czesc - middle part Rec.Left := Rec.Right; - Rec.Right := (Start+Dlugosc-Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote) * TempR + Left - NotesW - 0.5 + 10*ScreenX; + Rec.Right := (Start+Lenght-Lines[NrCzesci].Line[Lines[NrCzesci].Akt].StartNote) * TempR + Left - NotesW - 0.5 + 10*ScreenX; glBindTexture(GL_TEXTURE_2D, Tex_Mid[Color].TexNum); glBegin(GL_QUADS); diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas index 09cc57ec..70c97b88 100644 --- a/Game/Code/Classes/UFiles.pas +++ b/Game/Code/Classes/UFiles.pas @@ -115,12 +115,12 @@ begin //Golden + Freestyle Note Patch - case Lines.Line[C].Note[N].Wartosc of + case Lines.Line[C].Note[N].NoteType of 0: NoteState := 'F '; 1: NoteState := ': '; 2: NoteState := '* '; end; // case - S := NoteState + IntToStr(Start-RelativeSubTime) + ' ' + IntToStr(Dlugosc) + ' ' + IntToStr(Ton) + ' ' + Tekst; + S := NoteState + IntToStr(Start-RelativeSubTime) + ' ' + IntToStr(Lenght) + ' ' + IntToStr(Tone) + ' ' + Text; WriteLn(SongFile, S); diff --git a/Game/Code/Classes/ULyrics.pas b/Game/Code/Classes/ULyrics.pas index fb57220c..d0ef819f 100644 --- a/Game/Code/Classes/ULyrics.pas +++ b/Game/Code/Classes/ULyrics.pas @@ -309,7 +309,7 @@ begin //Copy Values from SongLine to LyricLine CountNotes := high(Line.Note); LyricLine.Start := Line.Note[0].Start; - LyricLine.Length := Line.Note[CountNotes].Start + Line.Note[CountNotes].Dlugosc - LyricLine.Start; + LyricLine.Length := Line.Note[CountNotes].Start + Line.Note[CountNotes].Lenght - LyricLine.Start; LyricLine.Freestyle := True; //is set by And Notes Freestyle while copying Notes LyricLine.Text := ''; //Also Set while copying Notes LyricLine.Players := 127; //All Players for now, no Duett Mode available @@ -320,8 +320,8 @@ begin begin LyricLine.Freestyle := LyricLine.Freestyle AND Line.Note[I].FreeStyle; LyricLine.Words[I].Start := Line.Note[I].Start; - LyricLine.Words[I].Length := Line.Note[I].Dlugosc; - LyricLine.Words[I].Text := Line.Note[I].Tekst; + LyricLine.Words[I].Length := Line.Note[I].Lenght; + LyricLine.Words[I].Text := Line.Note[I].Text; LyricLine.Words[I].Freestyle := Line.Note[I].FreeStyle; LyricLine.Text := LyricLine.Text + LyricLine.Words[I].Text end; diff --git a/Game/Code/Classes/ULyrics_bak.pas b/Game/Code/Classes/ULyrics_bak.pas index 86a69959..47c3ed03 100644 --- a/Game/Code/Classes/ULyrics_bak.pas +++ b/Game/Code/Classes/ULyrics_bak.pas @@ -266,8 +266,8 @@ begin Clear; for N := 0 to Lines[0].Line[NrCzesci].HighNote do begin Italic := Lines[0].Line[NrCzesci].Note[N].FreeStyle; - AddWord(Lines[0].Line[NrCzesci].Note[N].Tekst); - Text := Text + Lines[0].Line[NrCzesci].Note[N].Tekst; + AddWord(Lines[0].Line[NrCzesci].Note[N].Text); + Text := Text + Lines[0].Line[NrCzesci].Note[N].Text; end; Selected := -1; end; diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas index c6c1f8e1..4fab84e7 100644 --- a/Game/Code/Classes/UMain.pas +++ b/Game/Code/Classes/UMain.pas @@ -59,9 +59,9 @@ type IlNut: integer; Note: array of record Start: integer; - Dlugosc: integer; + Lenght: integer; Detekt: real; // accurate place, detected in the note - Ton: real; + Tone: real; Perfect: boolean; // true if the note matches the original one, lit the star // Half size Notes Patch @@ -736,9 +736,9 @@ begin for N := 0 to Lines[0].Line[Lines[0].Akt].HighNote do begin if (Lines[0].Line[Lines[0].Akt].Note[N].Start <= Czas.MidBeat) and - (Lines[0].Line[Lines[0].Akt].Note[N].Start + Lines[0].Line[Lines[0].Akt].Note[N].Dlugosc >= Czas.MidBeat) then + (Lines[0].Line[Lines[0].Akt].Note[N].Start + Lines[0].Line[Lines[0].Akt].Note[N].Lenght >= Czas.MidBeat) then begin - Done := (Czas.MidBeat - Lines[0].Line[Lines[0].Akt].Note[N].Start) / (Lines[0].Line[Lines[0].Akt].Note[N].Dlugosc); + Done := (Czas.MidBeat - Lines[0].Line[Lines[0].Akt].Note[N].Start) / (Lines[0].Line[Lines[0].Akt].Note[N].Lenght); end; end; @@ -747,7 +747,7 @@ begin // wylacza ostatnia nute po przejsciu {// todo: Lyrics if (Ini.LyricsEffect = 1) and (Done = 1) and - (Czas.MidBeat > Lines[0].Line[Lines[0].Akt].Note[N].Start + Lines[0].Line[Lines[0].Akt].Note[N].Dlugosc) + (Czas.MidBeat > Lines[0].Line[Lines[0].Akt].Note[N].Start + Lines[0].Line[Lines[0].Akt].Note[N].Lenght) then Sender.LyricMain.Selected := -1; if Done > 1 then Done := 1; @@ -912,7 +912,7 @@ begin AudioInputProcessor.Sound[CP].AnalyzeBuffer; // adds some noise - //Czas.Ton := Czas.Ton + Round(Random(3)) - 1; + //Czas.Tone := Czas.Tone + Round(Random(3)) - 1; // count min and max sentence range for checking (detection is delayed to the notes we see on the screen) SMin := Lines[0].Akt-1; @@ -928,9 +928,9 @@ begin for Pet := 0 to Lines[0].Line[S].HighNote do begin if ((Lines[0].Line[S].Note[Pet].Start <= Czas.AktBeatD) - and (Lines[0].Line[S].Note[Pet].Start + Lines[0].Line[S].Note[Pet].Dlugosc - 1 >= Czas.AktBeatD)) + and (Lines[0].Line[S].Note[Pet].Start + Lines[0].Line[S].Note[Pet].Lenght - 1 >= Czas.AktBeatD)) and (not Lines[0].Line[S].Note[Pet].FreeStyle) // but don't allow when it's FreeStyle note - and (Lines[0].Line[S].Note[Pet].Dlugosc > 0) then // and make sure the note lenghts is at least 1 + and (Lines[0].Line[S].Note[Pet].Lenght > 0) then // and make sure the note lenghts is at least 1 begin SDet := S; Mozna := true; @@ -942,7 +942,7 @@ begin S := SDet; //Czas.SzczytJest := true; - //Czas.Ton := 27; + //Czas.Tone := 27; // gdy moze, to dodaje nute if (AudioInputProcessor.Sound[CP].ToneValid) and (Mozna) then @@ -952,15 +952,15 @@ begin begin if (Lines[0].Line[S].Note[Pet].Start <= Czas.OldBeatD+1) and (Lines[0].Line[S].Note[Pet].Start + - Lines[0].Line[S].Note[Pet].Dlugosc > Czas.OldBeatD+1) then + Lines[0].Line[S].Note[Pet].Lenght > Czas.OldBeatD+1) then begin // to robi, tylko dla pary nut (oryginalnej i gracza) // przesuwanie tonu w odpowiednia game - while (AudioInputProcessor.Sound[CP].Tone - Lines[0].Line[S].Note[Pet].Ton > 6) do + while (AudioInputProcessor.Sound[CP].Tone - Lines[0].Line[S].Note[Pet].Tone > 6) do AudioInputProcessor.Sound[CP].Tone := AudioInputProcessor.Sound[CP].Tone - 12; - while (AudioInputProcessor.Sound[CP].Tone - Lines[0].Line[S].Note[Pet].Ton < -6) do + while (AudioInputProcessor.Sound[CP].Tone - Lines[0].Line[S].Note[Pet].Tone < -6) do AudioInputProcessor.Sound[CP].Tone := AudioInputProcessor.Sound[CP].Tone + 12; // Half size Notes Patch @@ -971,9 +971,9 @@ begin //if Ini.Difficulty = 2 then Range := 0; Range := 2 - Ini.Difficulty; - if abs(Lines[0].Line[S].Note[Pet].Ton - AudioInputProcessor.Sound[CP].Tone) <= Range then + if abs(Lines[0].Line[S].Note[Pet].Tone - AudioInputProcessor.Sound[CP].Tone) <= Range then begin - AudioInputProcessor.Sound[CP].Tone := Lines[0].Line[S].Note[Pet].Ton; + AudioInputProcessor.Sound[CP].Tone := Lines[0].Line[S].Note[Pet].Tone; // Half size Notes Patch NoteHit := true; @@ -981,21 +981,21 @@ begin if (Ini.LineBonus = 0) then begin // add points without LineBonus - case Lines[0].Line[S].Note[Pet].Wartosc of - 1: Player[CP].Score := Player[CP].Score + 10000 / Lines[0].Wartosc * - Lines[0].Line[S].Note[Pet].Wartosc; - 2: Player[CP].ScoreGolden := Player[CP].ScoreGolden + 10000 / Lines[0].Wartosc * - Lines[0].Line[S].Note[Pet].Wartosc; + case Lines[0].Line[S].Note[Pet].NoteType of + 1: Player[CP].Score := Player[CP].Score + 10000 / Lines[0].NoteType * + Lines[0].Line[S].Note[Pet].NoteType; + 2: Player[CP].ScoreGolden := Player[CP].ScoreGolden + 10000 / Lines[0].NoteType * + Lines[0].Line[S].Note[Pet].NoteType; end; end else begin // add points with Line Bonus - case Lines[0].Line[S].Note[Pet].Wartosc of - 1: Player[CP].Score := Player[CP].Score + 9000 / Lines[0].Wartosc * - Lines[0].Line[S].Note[Pet].Wartosc; - 2: Player[CP].ScoreGolden := Player[CP].ScoreGolden + 9000 / Lines[0].Wartosc * - Lines[0].Line[S].Note[Pet].Wartosc; + case Lines[0].Line[S].Note[Pet].NoteType of + 1: Player[CP].Score := Player[CP].Score + 9000 / Lines[0].NoteType * + Lines[0].Line[S].Note[Pet].NoteType; + 2: Player[CP].ScoreGolden := Player[CP].ScoreGolden + 9000 / Lines[0].NoteType * + Lines[0].Line[S].Note[Pet].NoteType; end; end; @@ -1012,10 +1012,10 @@ begin if S = SMax then begin Nowa := true; - // jezeli ostatnia ma ten sam ton + // jezeli ostatnia ma ten sam Tone if (Player[CP].IlNut > 0 ) and - (Player[CP].Note[Player[CP].HighNut].Ton = AudioInputProcessor.Sound[CP].Tone) and - (Player[CP].Note[Player[CP].HighNut].Start + Player[CP].Note[Player[CP].HighNut].Dlugosc = Czas.AktBeatD) then + (Player[CP].Note[Player[CP].HighNut].Tone = AudioInputProcessor.Sound[CP].Tone) and + (Player[CP].Note[Player[CP].HighNut].Start + Player[CP].Note[Player[CP].HighNut].Lenght = Czas.AktBeatD) then begin Nowa := false; end; @@ -1035,8 +1035,8 @@ begin Player[CP].HighNut := Player[CP].HighNut + 1; SetLength(Player[CP].Note, Player[CP].IlNut); Player[CP].Note[Player[CP].HighNut].Start := Czas.AktBeatD; - Player[CP].Note[Player[CP].HighNut].Dlugosc := 1; - Player[CP].Note[Player[CP].HighNut].Ton := AudioInputProcessor.Sound[CP].Tone; // Ton || TonDokl + Player[CP].Note[Player[CP].HighNut].Lenght := 1; + Player[CP].Note[Player[CP].HighNut].Tone := AudioInputProcessor.Sound[CP].Tone; // Ton || TonDokl Player[CP].Note[Player[CP].HighNut].Detekt := Czas.MidBeat; // Half Note Patch @@ -1047,15 +1047,15 @@ begin else begin // przedluzenie nuty - Player[CP].Note[Player[CP].HighNut].Dlugosc := Player[CP].Note[Player[CP].HighNut].Dlugosc + 1; + Player[CP].Note[Player[CP].HighNut].Lenght := Player[CP].Note[Player[CP].HighNut].Lenght + 1; end; // check for perfect note and then lit the star (on Draw) for Pet := 0 to Lines[0].Line[S].HighNote do begin if (Lines[0].Line[S].Note[Pet].Start = Player[CP].Note[Player[CP].HighNut].Start) and - (Lines[0].Line[S].Note[Pet].Dlugosc = Player[CP].Note[Player[CP].HighNut].Dlugosc) and - (Lines[0].Line[S].Note[Pet].Ton = Player[CP].Note[Player[CP].HighNut].Ton) then + (Lines[0].Line[S].Note[Pet].Lenght = Player[CP].Note[Player[CP].HighNut].Lenght) and + (Lines[0].Line[S].Note[Pet].Tone = Player[CP].Note[Player[CP].HighNut].Tone) then begin Player[CP].Note[Player[CP].HighNut].Perfect := true; end; @@ -1070,7 +1070,7 @@ begin if (sDet >= low(Lines[0].Line)) and (sDet <= high(Lines[0].Line)) then begin if assigned( Sender ) and - ((Lines[0].Line[SDet].Note[Lines[0].Line[SDet].HighNote].Start + Lines[0].Line[SDet].Note[Lines[0].Line[SDet].HighNote].Dlugosc - 1) = Czas.AktBeatD) then + ((Lines[0].Line[SDet].Note[Lines[0].Line[SDet].HighNote].Start + Lines[0].Line[SDet].Note[Lines[0].Line[SDet].HighNote].Lenght - 1) = Czas.AktBeatD) then begin Sender.onSentenceEnd(sDet); end; diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas index b2f1bf56..90e78dd7 100644 --- a/Game/Code/Classes/UMusic.pas +++ b/Game/Code/Classes/UMusic.pas @@ -29,7 +29,7 @@ type StartNote: integer; Lyric: string; LyricWidth: real; - Koniec: integer; // (TODO: rename to End_/Ending?) + End_: integer; BaseNote: integer; HighNote: integer; IlNut: integer; // (TODO: Il = tone, Nut(a) = Note) @@ -37,12 +37,12 @@ type Note: array of record Color: integer; Start: integer; - Dlugosc: integer; // (TODO: rename to Length) - Ton: integer; // full range tone (TODO: rename to Tone) + Lenght: integer; + Tone: integer; // full range tone TonGamy: integer; // tone unified to one octave (TODO: rename to something meaningful, ToneGamus) - Tekst: string; // (TODO: rename to Text) + Text: string; // (TODO: rename to Text) FreeStyle: boolean; - Wartosc: integer; // normal-note: 1, golden-note: 2 (TODO: wartosc=value, rename to Type_ or Kind?) + NoteType: integer; // normal-note: 1, golden-note: 2 (TODO: wartosc=value, rename to Type_ or Kind?) end; end; ALine = array of TLine; // (TODO: rename to TLineArray) @@ -54,7 +54,7 @@ type Ilosc: integer; // (TODO: Ilosc = Number/Count) Resolution: integer; NotesGAP: integer; - Wartosc: integer; // TODO: rename (wartosc=value) + NoteType: integer; // TODO: rename (wartosc=value) Line: ALine; // TODO: rename to Sentence or Line - renamed to Line end; diff --git a/Game/Code/Classes/USong.pas b/Game/Code/Classes/USong.pas index c7d11374..5db250c5 100644 --- a/Game/Code/Classes/USong.pas +++ b/Game/Code/Classes/USong.pas @@ -181,7 +181,7 @@ begin MultBPM := 4; // multiply beat-count of note by 4 Mult := 1; // accuracy of measurement of note Base[0] := 100; // high number - Lines[0].Wartosc := 0; + Lines[0].NoteType := 0; self.Relative := false; Rel[0] := 0; CP := 0; @@ -295,7 +295,7 @@ begin Lines[CP].Line[Lines[CP].High].TotalNotes := 0; for I := low(Lines[CP].Line[Lines[CP].High].Note) to high(Lines[CP].Line[Lines[CP].High].Note) do begin - Lines[CP].Line[Lines[CP].High].TotalNotes := Lines[CP].Line[Lines[CP].High].TotalNotes + Lines[CP].Line[Lines[CP].High].Note[I].Dlugosc * Lines[CP].Line[Lines[CP].High].Note[I].Wartosc; + Lines[CP].Line[Lines[CP].High].TotalNotes := Lines[CP].Line[Lines[CP].High].TotalNotes + Lines[CP].Line[Lines[CP].High].Note[I].Lenght * Lines[CP].Line[Lines[CP].High].Note[I].NoteType; end; //Total Notes Patch End end else begin @@ -306,7 +306,7 @@ begin Lines[Pet].Line[Lines[Pet].High].TotalNotes := 0; for I := low(Lines[Pet].Line[Lines[Pet].High].Note) to high(Lines[Pet].Line[Lines[Pet].High].Note) do begin - Lines[Pet].Line[Lines[Pet].High].TotalNotes := Lines[Pet].Line[Lines[Pet].High].TotalNotes + Lines[Pet].Line[Lines[Pet].High].Note[I].Dlugosc * Lines[Pet].Line[Lines[Pet].High].Note[I].Wartosc; + Lines[Pet].Line[Lines[Pet].High].TotalNotes := Lines[Pet].Line[Lines[Pet].High].TotalNotes + Lines[Pet].Line[Lines[Pet].High].Note[I].Lenght * Lines[Pet].Line[Lines[Pet].High].Note[I].NoteType; end; //Total Notes Patch End end; @@ -592,29 +592,29 @@ begin // Start := Note[HighNote].Start; end; - Note[HighNote].Dlugosc := DurationP; - Melody.DlugoscNut := Melody.DlugoscNut + Note[HighNote].Dlugosc; + Note[HighNote].Lenght := DurationP; + Melody.DlugoscNut := Melody.DlugoscNut + Note[HighNote].Lenght; // back to the normal system with normal, golden and now freestyle notes case TypeP of - 'F': Note[HighNote].Wartosc := 0; - ':': Note[HighNote].Wartosc := 1; - '*': Note[HighNote].Wartosc := 2; + 'F': Note[HighNote].NoteType := 0; + ':': Note[HighNote].NoteType := 1; + '*': Note[HighNote].NoteType := 2; end; - Lines[NrCzesci].Wartosc := Lines[NrCzesci].Wartosc + Note[HighNote].Dlugosc * Note[HighNote].Wartosc; + Lines[NrCzesci].NoteType := Lines[NrCzesci].NoteType + Note[HighNote].Lenght * Note[HighNote].NoteType; - Note[HighNote].Ton := NoteP; - if Note[HighNote].Ton < Base[NrCzesci] then Base[NrCzesci] := Note[HighNote].Ton; + Note[HighNote].Tone := NoteP; + if Note[HighNote].Tone < Base[NrCzesci] then Base[NrCzesci] := Note[HighNote].Tone; Note[HighNote].TonGamy := Note[HighNote].TonGamy mod 12; - Note[HighNote].Tekst := Copy(LyricS, 2, 100); - Lyric := Lyric + Note[HighNote].Tekst; + Note[HighNote].Text := Copy(LyricS, 2, 100); + Lyric := Lyric + Note[HighNote].Text; if TypeP = 'F' then Note[HighNote].FreeStyle := true; - Koniec := Note[HighNote].Start + Note[HighNote].Dlugosc; + End_ := Note[HighNote].Start + Note[HighNote].Lenght; end; // with end; @@ -631,7 +631,7 @@ begin Lines[NrCzesciP].Line[Lines[NrCzesciP].High].TotalNotes := 0; for I := low(Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Note) to high(Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Note) do begin - Lines[NrCzesciP].Line[Lines[NrCzesciP].High].TotalNotes := Lines[NrCzesciP].Line[Lines[NrCzesciP].High].TotalNotes + Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Note[I].Dlugosc * Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Note[I].Wartosc; + Lines[NrCzesciP].Line[Lines[NrCzesciP].High].TotalNotes := Lines[NrCzesciP].Line[Lines[NrCzesciP].High].TotalNotes + Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Note[I].Lenght * Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Note[I].NoteType; end; //Total Notes Patch End diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas index 5887943c..75f5b3b7 100644 --- a/Game/Code/Screens/UScreenEditConvert.pas +++ b/Game/Code/Screens/UScreenEditConvert.pas @@ -75,7 +75,7 @@ type Ticks: real; Note: array of TNuta; - procedure AddLyric(Start: integer; Tekst: string); + procedure AddLyric(Start: integer; Text: string); procedure Extract; {$IFDEF UseMIDIPort} @@ -205,24 +205,24 @@ begin end; end; -procedure TScreenEditConvert.AddLyric(Start: integer; Tekst: string); +procedure TScreenEditConvert.AddLyric(Start: integer; Text: string); var N: integer; begin for N := 0 to High(Note) do begin if Note[N].Start = Start then begin // check for new sentece - if Copy(Tekst, 1, 1) = '\' then Delete(Tekst, 1, 1); - if Copy(Tekst, 1, 1) = '/' then begin - Delete(Tekst, 1, 1); + if Copy(Text, 1, 1) = '\' then Delete(Text, 1, 1); + if Copy(Text, 1, 1) = '/' then begin + Delete(Text, 1, 1); Note[N].NewSentence := true; end; // overwrite lyric od append if Note[N].Lyric = '-' then - Note[N].Lyric := Tekst + Note[N].Lyric := Text else - Note[N].Lyric := Note[N].Lyric + Tekst; + Note[N].Lyric := Note[N].Lyric + Text; end; end; end; @@ -341,11 +341,11 @@ begin // dopisuje Lines.Line[C].Note[N].Start := Note[Nu].Start; - Lines.Line[C].Note[N].Dlugosc := Note[Nu].Len; - Lines.Line[C].Note[N].Ton := Note[Nu].Tone; - Lines.Line[C].Note[N].Tekst := Note[Nu].Lyric; + Lines.Line[C].Note[N].Lenght := Note[Nu].Len; + Lines.Line[C].Note[N].Tone := Note[Nu].Tone; + Lines.Line[C].Note[N].Text := Note[Nu].Lyric; //All Notes are Freestyle when Converted Fix: - Lines.Line[C].Note[N].Wartosc := 1; + Lines.Line[C].Note[N].NoteType := 1; Inc(N); end; end; diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas index ea1642c3..29ff50a5 100644 --- a/Game/Code/Screens/UScreenEditSub.pas +++ b/Game/Code/Screens/UScreenEditSub.pas @@ -134,9 +134,9 @@ begin SDLK_BACKQUOTE: begin // Increase Note Length (same as Alt + Right) - Inc(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Dlugosc); + Inc(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Lenght); if AktNuta = Lines[0].Line[Lines[0].Akt].HighNote then - Inc(Lines[0].Line[Lines[0].Akt].Koniec); + Inc(Lines[0].Line[Lines[0].Akt].End_); end; SDLK_EQUALS: @@ -324,7 +324,7 @@ begin if R <= AudioPlayback.Length then begin AudioPlayback.Position := R; - PlayStopTime := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].Koniec); + PlayStopTime := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].End_); PlaySentence := true; AudioPlayback.Play; LastClick := -100; @@ -336,7 +336,7 @@ begin MidiTime := USTime.GetTime; MidiStart := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].StartNote); - MidiStop := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].Koniec); + MidiStop := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].End_); LastClick := -100; end; @@ -344,14 +344,14 @@ begin PlaySentenceMidi := true; MidiTime := USTime.GetTime; MidiStart := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].StartNote); - MidiStop := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].Koniec); + MidiStop := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].End_); LastClick := -100; PlaySentence := true; Click := true; AudioPlayback.Stop; AudioPlayback.Position := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].StartNote)+0{-0.10}; - PlayStopTime := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].Koniec)+0; + PlayStopTime := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].End_)+0; AudioPlayback.Play; LastClick := -100; end; @@ -367,7 +367,7 @@ begin AudioPlayback.Position := GetTimeFromBeat(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Start); PlayStopTime := (GetTimeFromBeat( Lines[0].Line[Lines[0].Akt].Note[AktNuta].Start + - Lines[0].Line[Lines[0].Akt].Note[AktNuta].Dlugosc)); + Lines[0].Line[Lines[0].Akt].Note[AktNuta].Lenght)); AudioPlayback.Play; LastClick := -100; end; @@ -407,8 +407,8 @@ begin // ctrl + right if SDL_ModState = KMOD_LCTRL then begin - if Lines[0].Line[Lines[0].Akt].Note[AktNuta].Dlugosc > 1 then begin - Dec(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Dlugosc); + if Lines[0].Line[Lines[0].Akt].Note[AktNuta].Lenght > 1 then begin + Dec(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Lenght); Inc(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Start); if AktNuta = 0 then begin Inc(Lines[0].Line[Lines[0].Akt].Start); @@ -425,14 +425,14 @@ begin Inc(Lines[0].Line[Lines[0].Akt].StartNote); end; if AktNuta = Lines[0].Line[Lines[0].Akt].HighNote then - Inc(Lines[0].Line[Lines[0].Akt].Koniec); + Inc(Lines[0].Line[Lines[0].Akt].End_); end; // alt + right if SDL_ModState = KMOD_LALT then begin - Inc(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Dlugosc); + Inc(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Lenght); if AktNuta = Lines[0].Line[Lines[0].Akt].HighNote then - Inc(Lines[0].Line[Lines[0].Akt].Koniec); + Inc(Lines[0].Line[Lines[0].Akt].End_); end; // alt + ctrl + shift + right = move all from cursor to right @@ -456,7 +456,7 @@ begin // ctrl + left if SDL_ModState = KMOD_LCTRL then begin Dec(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Start); - Inc(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Dlugosc); + Inc(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Lenght); if AktNuta = 0 then begin Dec(Lines[0].Line[Lines[0].Akt].Start); Dec(Lines[0].Line[Lines[0].Akt].StartNote); @@ -474,16 +474,16 @@ begin end; if AktNuta = Lines[0].Line[Lines[0].Akt].HighNote then - Dec(Lines[0].Line[Lines[0].Akt].Koniec); + Dec(Lines[0].Line[Lines[0].Akt].End_); end; // alt + left if SDL_ModState = KMOD_LALT then begin - if Lines[0].Line[Lines[0].Akt].Note[AktNuta].Dlugosc > 1 then begin - Dec(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Dlugosc); + if Lines[0].Line[Lines[0].Akt].Note[AktNuta].Lenght > 1 then begin + Dec(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Lenght); if AktNuta = Lines[0].Line[Lines[0].Akt].HighNote then - Dec(Lines[0].Line[Lines[0].Akt].Koniec); + Dec(Lines[0].Line[Lines[0].Akt].End_); end; end; @@ -499,7 +499,7 @@ begin {$IFDEF UseMIDIPort} // skip to next sentence if SDL_ModState = 0 then begin - MidiOut.PutShort($81, Lines[0].Line[Lines[0].Akt].Note[MidiLastNote].Ton + 60, 127); + MidiOut.PutShort($81, Lines[0].Line[Lines[0].Akt].Note[MidiLastNote].Tone + 60, 127); PlaySentenceMidi := false; Lines[0].Line[Lines[0].Akt].Note[AktNuta].Color := 0; @@ -527,7 +527,7 @@ begin {$IFDEF UseMIDIPort} // skip to previous sentence if SDL_ModState = 0 then begin - MidiOut.PutShort($81, Lines[0].Line[Lines[0].Akt].Note[MidiLastNote].Ton + 60, 127); + MidiOut.PutShort($81, Lines[0].Line[Lines[0].Akt].Note[MidiLastNote].Tone + 60, 127); PlaySentenceMidi := false; Lines[0].Line[Lines[0].Akt].Note[AktNuta].Color := 0; @@ -552,10 +552,10 @@ begin // Golden Note Patch SDLK_G: begin - case Lines[0].Line[Lines[0].Akt].Note[AktNuta].Wartosc of - 0: Lines[0].Line[Lines[0].Akt].Note[AktNuta].Wartosc := 2; - 1: Lines[0].Line[Lines[0].Akt].Note[AktNuta].Wartosc := 2; - 2: Lines[0].Line[Lines[0].Akt].Note[AktNuta].Wartosc := 1; + case Lines[0].Line[Lines[0].Akt].Note[AktNuta].NoteType of + 0: Lines[0].Line[Lines[0].Akt].Note[AktNuta].NoteType := 2; + 1: Lines[0].Line[Lines[0].Akt].Note[AktNuta].NoteType := 2; + 2: Lines[0].Line[Lines[0].Akt].Note[AktNuta].NoteType := 1; end; // case Lines[0].Line[Lines[0].Akt].Note[AktNuta].Freestyle := False; end; @@ -563,15 +563,15 @@ begin // Freestyle Note Patch SDLK_F: begin - case Lines[0].Line[Lines[0].Akt].Note[AktNuta].Wartosc of + case Lines[0].Line[Lines[0].Akt].Note[AktNuta].NoteType of 0: begin; - Lines[0].Line[Lines[0].Akt].Note[AktNuta].Wartosc := 1; + Lines[0].Line[Lines[0].Akt].Note[AktNuta].NoteType := 1; Lines[0].Line[Lines[0].Akt].Note[AktNuta].Freestyle := False; end; 1,2: begin; - Lines[0].Line[Lines[0].Akt].Note[AktNuta].Wartosc := 0; + Lines[0].Line[Lines[0].Akt].Note[AktNuta].NoteType := 0; Lines[0].Line[Lines[0].Akt].Note[AktNuta].Freestyle := True; end; end; // case @@ -609,13 +609,13 @@ begin end; SDLK_0..SDLK_9, SDLK_A..SDLK_Z, SDLK_SPACE, SDLK_MINUS, SDLK_EXCLAIM, SDLK_COMMA, SDLK_SLASH, SDLK_ASTERISK, SDLK_QUESTION, SDLK_QUOTE, SDLK_QUOTEDBL: begin - Lines[0].Line[Lines[0].Akt].Note[AktNuta].Tekst := - Lines[0].Line[Lines[0].Akt].Note[AktNuta].Tekst + chr(ScanCode); + Lines[0].Line[Lines[0].Akt].Note[AktNuta].Text := + Lines[0].Line[Lines[0].Akt].Note[AktNuta].Text + chr(ScanCode); end; SDLK_BACKSPACE: begin - Delete(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Tekst, - Length(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Tekst), 1); + Delete(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Text, + Length(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Text), 1); end; SDLK_RIGHT: begin @@ -661,10 +661,10 @@ begin for C := 0 to Lines[0].High do begin Lines[0].Line[C].Start := Lines[0].Line[C].Start div 2; Lines[0].Line[C].StartNote := Lines[0].Line[C].StartNote div 2; - Lines[0].Line[C].Koniec := Lines[0].Line[C].Koniec div 2; + Lines[0].Line[C].End_ := Lines[0].Line[C].End_ div 2; for N := 0 to Lines[0].Line[C].HighNote do begin Lines[0].Line[C].Note[N].Start := Lines[0].Line[C].Note[N].Start div 2; - Lines[0].Line[C].Note[N].Dlugosc := Round(Lines[0].Line[C].Note[N].Dlugosc / 2); + Lines[0].Line[C].Note[N].Lenght := Round(Lines[0].Line[C].Note[N].Lenght / 2); end; // N end; // C end; @@ -678,10 +678,10 @@ begin for C := 0 to Lines[0].High do begin Lines[0].Line[C].Start := Lines[0].Line[C].Start * 2; Lines[0].Line[C].StartNote := Lines[0].Line[C].StartNote * 2; - Lines[0].Line[C].Koniec := Lines[0].Line[C].Koniec * 2; + Lines[0].Line[C].End_ := Lines[0].Line[C].End_ * 2; for N := 0 to Lines[0].Line[C].HighNote do begin Lines[0].Line[C].Note[N].Start := Lines[0].Line[C].Note[N].Start * 2; - Lines[0].Line[C].Note[N].Dlugosc := Lines[0].Line[C].Note[N].Dlugosc * 2; + Lines[0].Line[C].Note[N].Lenght := Lines[0].Line[C].Note[N].Lenght * 2; end; // N end; // C end; @@ -695,12 +695,12 @@ begin // temporary { for C := 0 to Lines[0].High do for N := 0 to Lines[0].Line[C].HighNut do - Lines[0].Line[C].Note[N].Tekst := AnsiLowerCase(Lines[0].Line[C].Note[N].Tekst);} + Lines[0].Line[C].Note[N].Text := AnsiLowerCase(Lines[0].Line[C].Note[N].Text);} for C := 0 to Lines[0].High do begin - S := AnsiUpperCase(Copy(Lines[0].Line[C].Note[0].Tekst, 1, 1)); - S := S + Copy(Lines[0].Line[C].Note[0].Tekst, 2, Length(Lines[0].Line[C].Note[0].Tekst)-1); - Lines[0].Line[C].Note[0].Tekst := S; + S := AnsiUpperCase(Copy(Lines[0].Line[C].Note[0].Text, 1, 1)); + S := S + Copy(Lines[0].Line[C].Note[0].Text, 2, Length(Lines[0].Line[C].Note[0].Text)-1); + Lines[0].Line[C].Note[0].Text := S; end; // C end; @@ -711,39 +711,39 @@ var begin for C := 0 to Lines[0].High do begin // correct starting spaces in the first word - while Copy(Lines[0].Line[C].Note[0].Tekst, 1, 1) = ' ' do - Lines[0].Line[C].Note[0].Tekst := Copy(Lines[0].Line[C].Note[0].Tekst, 2, 100); + while Copy(Lines[0].Line[C].Note[0].Text, 1, 1) = ' ' do + Lines[0].Line[C].Note[0].Text := Copy(Lines[0].Line[C].Note[0].Text, 2, 100); // move spaces on the start to the end of the previous note for N := 1 to Lines[0].Line[C].HighNote do begin - while (Copy(Lines[0].Line[C].Note[N].Tekst, 1, 1) = ' ') do begin - Lines[0].Line[C].Note[N].Tekst := Copy(Lines[0].Line[C].Note[N].Tekst, 2, 100); - Lines[0].Line[C].Note[N-1].Tekst := Lines[0].Line[C].Note[N-1].Tekst + ' '; + while (Copy(Lines[0].Line[C].Note[N].Text, 1, 1) = ' ') do begin + Lines[0].Line[C].Note[N].Text := Copy(Lines[0].Line[C].Note[N].Text, 2, 100); + Lines[0].Line[C].Note[N-1].Text := Lines[0].Line[C].Note[N-1].Text + ' '; end; end; // N // correct '-' to '- ' for N := 0 to Lines[0].Line[C].HighNote do begin - if Lines[0].Line[C].Note[N].Tekst = '-' then - Lines[0].Line[C].Note[N].Tekst := '- '; + if Lines[0].Line[C].Note[N].Text = '-' then + Lines[0].Line[C].Note[N].Text := '- '; end; // N // add space to the previous note when the current word is '- ' for N := 1 to Lines[0].Line[C].HighNote do begin - if Lines[0].Line[C].Note[N].Tekst = '- ' then - Lines[0].Line[C].Note[N-1].Tekst := Lines[0].Line[C].Note[N-1].Tekst + ' '; + if Lines[0].Line[C].Note[N].Text = '- ' then + Lines[0].Line[C].Note[N-1].Text := Lines[0].Line[C].Note[N-1].Text + ' '; end; // N // correct too many spaces at the end of note for N := 0 to Lines[0].Line[C].HighNote do begin - while Copy(Lines[0].Line[C].Note[N].Tekst, Length(Lines[0].Line[C].Note[N].Tekst)-1, 2) = ' ' do - Lines[0].Line[C].Note[N].Tekst := Copy(Lines[0].Line[C].Note[N].Tekst, 1, Length(Lines[0].Line[C].Note[N].Tekst)-1); + while Copy(Lines[0].Line[C].Note[N].Text, Length(Lines[0].Line[C].Note[N].Text)-1, 2) = ' ' do + Lines[0].Line[C].Note[N].Text := Copy(Lines[0].Line[C].Note[N].Text, 1, Length(Lines[0].Line[C].Note[N].Text)-1); end; // N // and correct if there is no space at the end of sentence N := Lines[0].Line[C].HighNote; - if Copy(Lines[0].Line[C].Note[N].Tekst, Length(Lines[0].Line[C].Note[N].Tekst), 1) <> ' ' then - Lines[0].Line[C].Note[N].Tekst := Lines[0].Line[C].Note[N].Tekst + ' '; + if Copy(Lines[0].Line[C].Note[N].Text, Length(Lines[0].Line[C].Note[N].Text), 1) <> ' ' then + Lines[0].Line[C].Note[N].Text := Lines[0].Line[C].Note[N].Text + ' '; end; // C end; @@ -757,7 +757,7 @@ var begin for C := 1 to Lines[0].High do begin with Lines[0].Line[C-1] do begin - Min := Note[HighNote].Start + Note[HighNote].Dlugosc; + Min := Note[HighNote].Start + Note[HighNote].Lenght; Max := Lines[0].Line[C].StartNote; case (Max - Min) of 0: S := Max; @@ -805,7 +805,7 @@ begin Lines[0].Line[CNew].StartNote := Lines[0].Line[CStart].Note[NStart].Start; Lines[0].Line[CNew].Lyric := ''; Lines[0].Line[CNew].LyricWidth := 0; - Lines[0].Line[CNew].Koniec := 0; + Lines[0].Line[CNew].End_ := 0; Lines[0].Line[CNew].BaseNote := 0; // 0.5.0: we modify it later in this procedure Lines[0].Line[CNew].IlNut := 0; Lines[0].Line[CNew].HighNote := -1; @@ -821,22 +821,22 @@ begin // increase sentence counters Inc(Lines[0].Line[CNew].IlNut); Inc(Lines[0].Line[CNew].HighNote); - Lines[0].Line[CNew].Koniec := Lines[0].Line[CNew].Note[NNewL].Start + - Lines[0].Line[CNew].Note[NNewL].Dlugosc; + Lines[0].Line[CNew].End_ := Lines[0].Line[CNew].Note[NNewL].Start + + Lines[0].Line[CNew].Note[NNewL].Lenght; end; // clear old notes and set sentence counters Lines[0].Line[CStart].HighNote := NStart - 1; Lines[0].Line[CStart].IlNut := Lines[0].Line[CStart].HighNote + 1; - Lines[0].Line[CStart].Koniec := Lines[0].Line[CStart].Note[NStart-1].Start + - Lines[0].Line[CStart].Note[NStart-1].Dlugosc; + Lines[0].Line[CStart].End_ := Lines[0].Line[CStart].Note[NStart-1].Start + + Lines[0].Line[CStart].Note[NStart-1].Lenght; SetLength(Lines[0].Line[CStart].Note, Lines[0].Line[CStart].IlNut); // 0.5.0: modify BaseNote Lines[0].Line[CNew].BaseNote := 120; for N := 0 to Lines[0].Line[CNew].IlNut do - if Lines[0].Line[CNew].Note[N].Ton < Lines[0].Line[CNew].BaseNote then - Lines[0].Line[CNew].BaseNote := Lines[0].Line[CNew].Note[N].Ton; + if Lines[0].Line[CNew].Note[N].Tone < Lines[0].Line[CNew].BaseNote then + Lines[0].Line[CNew].BaseNote := Lines[0].Line[CNew].Note[N].Tone; Lines[0].Akt := Lines[0].Akt + 1; AktNuta := 0; @@ -868,8 +868,8 @@ begin // increase sentence counters NDst := Lines[0].Line[C].HighNote; - Lines[0].Line[C].Koniec := Lines[0].Line[C].Note[NDst].Start + - Lines[0].Line[C].Note[NDst].Dlugosc; + Lines[0].Line[C].End_ := Lines[0].Line[C].Note[NDst].Start + + Lines[0].Line[C].Note[NDst].Lenght; // move needed sentences to one backward. for C := Lines[0].Akt + 1 to Lines[0].High - 1 do @@ -900,10 +900,10 @@ begin end; // me slightly modify new note - Lines[0].Line[C].Note[AktNuta].Dlugosc := 1; + Lines[0].Line[C].Note[AktNuta].Lenght := 1; Inc(Lines[0].Line[C].Note[AktNuta+1].Start); - Dec(Lines[0].Line[C].Note[AktNuta+1].Dlugosc); - Lines[0].Line[C].Note[AktNuta+1].Tekst := '- '; + Dec(Lines[0].Line[C].Note[AktNuta+1].Lenght); + Lines[0].Line[C].Note[AktNuta+1].Text := '- '; Lines[0].Line[C].Note[AktNuta+1].Color := 0; end; @@ -962,7 +962,7 @@ end; procedure TScreenEditSub.TransposeNote(Transpose: integer); begin - Inc(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Ton, Transpose); + Inc(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Tone, Transpose); end; procedure TScreenEditSub.ChangeWholeTone(Tone: integer); @@ -973,7 +973,7 @@ begin for C := 0 to Lines[0].High do begin Lines[0].Line[C].BaseNote := Lines[0].Line[C].BaseNote + Tone; for N := 0 to Lines[0].Line[C].HighNote do - Lines[0].Line[C].Note[N].Ton := Lines[0].Line[C].Note[N].Ton + Tone; + Lines[0].Line[C].Note[N].Tone := Lines[0].Line[C].Note[N].Tone + Tone; end; end; @@ -995,7 +995,7 @@ begin end; if N = Lines[0].Line[C].HighNote then // fix ending - Inc(Lines[0].Line[C].Koniec, Move); + Inc(Lines[0].Line[C].End_, Move); end; // for end; // for @@ -1010,22 +1010,22 @@ begin { C := Lines[0].Akt; for N := Lines[0].Line[C].HighNut downto 1 do begin - Lines[0].Line[C].Note[N].Tekst := Lines[0].Line[C].Note[N-1].Tekst; + Lines[0].Line[C].Note[N].Text := Lines[0].Line[C].Note[N-1].Text; end; // for - Lines[0].Line[C].Note[0].Tekst := '- ';} + Lines[0].Line[C].Note[0].Text := '- ';} C := Lines[0].Akt; NHigh := Lines[0].Line[C].HighNote; // last word - Lines[0].Line[C].Note[NHigh].Tekst := Lines[0].Line[C].Note[NHigh-1].Tekst + Lines[0].Line[C].Note[NHigh].Tekst; + Lines[0].Line[C].Note[NHigh].Text := Lines[0].Line[C].Note[NHigh-1].Text + Lines[0].Line[C].Note[NHigh].Text; // other words for N := NHigh - 1 downto AktNuta + 1 do begin - Lines[0].Line[C].Note[N].Tekst := Lines[0].Line[C].Note[N-1].Tekst; + Lines[0].Line[C].Note[N].Text := Lines[0].Line[C].Note[N-1].Text; end; // for - Lines[0].Line[C].Note[AktNuta].Tekst := '- '; + Lines[0].Line[C].Note[AktNuta].Text := '- '; end; procedure TScreenEditSub.MarkSrc; @@ -1041,7 +1041,7 @@ begin C := Lines[0].Akt; for N := 0 to Lines[0].Line[CopySrc].HighNote do - Lines[0].Line[C].Note[N].Tekst := Lines[0].Line[CopySrc].Note[N].Tekst; + Lines[0].Line[C].Note[N].Text := Lines[0].Line[CopySrc].Note[N].Text; end; procedure TScreenEditSub.CopySentence(Src, Dst: integer); @@ -1059,13 +1059,13 @@ begin Lines[0].Line[Dst].IlNut := Lines[0].Line[Src].IlNut; Lines[0].Line[Dst].HighNote := Lines[0].Line[Src].HighNote; for N := 0 to Lines[0].Line[Src].HighNote do begin - Lines[0].Line[Dst].Note[N].Tekst := Lines[0].Line[Src].Note[N].Tekst; - Lines[0].Line[Dst].Note[N].Dlugosc := Lines[0].Line[Src].Note[N].Dlugosc; - Lines[0].Line[Dst].Note[N].Ton := Lines[0].Line[Src].Note[N].Ton; + Lines[0].Line[Dst].Note[N].Text := Lines[0].Line[Src].Note[N].Text; + Lines[0].Line[Dst].Note[N].Lenght := Lines[0].Line[Src].Note[N].Lenght; + Lines[0].Line[Dst].Note[N].Tone := Lines[0].Line[Src].Note[N].Tone; Lines[0].Line[Dst].Note[N].Start := Lines[0].Line[Src].Note[N].Start + TD; end; N := Lines[0].Line[Src].HighNote; - Lines[0].Line[Dst].Koniec := Lines[0].Line[Dst].Note[N].Start + Lines[0].Line[Dst].Note[N].Dlugosc; + Lines[0].Line[Dst].End_ := Lines[0].Line[Dst].Note[N].Start + Lines[0].Line[Dst].Note[N].Lenght; end; procedure TScreenEditSub.CopySentences(Src, Dst, Num: integer); @@ -1091,9 +1091,9 @@ begin Lines[0].Line[Dst + C].IlNut := 1; Lines[0].Line[Dst + C].HighNote := 0; Lines[0].Line[Dst + C].Note[0].Start := Lines[0].Line[Dst + C].Start; - Lines[0].Line[Dst + C].Note[0].Dlugosc := 1; + Lines[0].Line[Dst + C].Note[0].Lenght := 1; Lines[0].Line[Dst + C].StartNote := Lines[0].Line[Dst + C].Start; - Lines[0].Line[Dst + C].Koniec := Lines[0].Line[Dst + C].Start + 1; + Lines[0].Line[Dst + C].End_ := Lines[0].Line[Dst + C].Start + 1; end; // increase counters @@ -1239,7 +1239,7 @@ begin {$IFDEF UseMIDIPort} // stop the music if (MidiPos > MidiStop) then begin - MidiOut.PutShort($81, Lines[0].Line[Lines[0].Akt].Note[MidiLastNote].Ton + 60, 127); + MidiOut.PutShort($81, Lines[0].Line[Lines[0].Akt].Note[MidiLastNote].Tone + 60, 127); PlaySentenceMidi := false; end; {$ENDIF} @@ -1256,8 +1256,8 @@ begin {$IFDEF UseMIDIPort} LastClick := AktBeat; if Pet > 0 then - MidiOut.PutShort($81, Lines[0].Line[Lines[0].Akt].Note[Pet-1].Ton + 60, 127); - MidiOut.PutShort($91, Lines[0].Line[Lines[0].Akt].Note[Pet].Ton + 60, 127); + MidiOut.PutShort($81, Lines[0].Line[Lines[0].Akt].Note[Pet-1].Tone + 60, 127); + MidiOut.PutShort($91, Lines[0].Line[Lines[0].Akt].Note[Pet].Tone + 60, 127); MidiLastNote := Pet; {$ENDIF} @@ -1303,9 +1303,9 @@ begin begin // Note info Text[TextNStart].Text := IntToStr(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Start); - Text[TextNDlugosc].Text := IntToStr(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Dlugosc); - Text[TextNTon].Text := IntToStr(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Ton) + ' ( ' + GetNoteName(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Ton) + ' )'; - Text[TextNText].Text := Lines[0].Line[Lines[0].Akt].Note[AktNuta].Tekst; + Text[TextNDlugosc].Text := IntToStr(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Lenght); + Text[TextNTon].Text := IntToStr(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Tone) + ' ( ' + GetNoteName(Lines[0].Line[Lines[0].Akt].Note[AktNuta].Tone) + ' )'; + Text[TextNText].Text := Lines[0].Line[Lines[0].Akt].Note[AktNuta].Text; end; // Text Edit Mode diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index f56b15df..2f8df0a6 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -1327,7 +1327,7 @@ begin //PhrasenBonus - Line Bonus Mod //Generate Steps 0 to 8 - A := Floor(A / (B * Lines[0].Line[S].TotalNotes / Lines[0].Wartosc) * 8); + A := Floor(A / (B * Lines[0].Line[S].TotalNotes / Lines[0].NoteType) * 8); If (Ini.LineBonus > 0) then begin diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas index 05675011..4218dd86 100644 --- a/Game/Code/Screens/UScreenSingModi.pas +++ b/Game/Code/Screens/UScreenSingModi.pas @@ -136,7 +136,7 @@ begin Result.Ilosc := Lines.Ilosc; Result.Resolution := Lines.Resolution; Result.NotesGAP := Lines.NotesGAP; - Result.TotalLength := Lines.Wartosc; + Result.TotalLength := Lines.NoteType; SetLength(Result.Sentence, Length(Lines.Line)); for I := low(Result.Sentence) to high(Result.Sentence) do @@ -145,7 +145,7 @@ begin Result.Sentence[I].StartNote := Lines.Line[I].StartNote; Result.Sentence[I].Lyric := Lines.Line[I].Lyric; Result.Sentence[I].LyricWidth := Lines.Line[I].LyricWidth; - Result.Sentence[I].Koniec := Lines.Line[I].Koniec; + Result.Sentence[I].Koniec := Lines.Line[I].End_; Result.Sentence[I].BaseNote := Lines.Line[I].BaseNote; Result.Sentence[I].HighNote := Lines.Line[I].HighNote; Result.Sentence[I].IlNut := Lines.Line[I].IlNut; @@ -156,12 +156,12 @@ begin begin Result.Sentence[I].Note[J].Color := Lines.Line[I].Note[J].Color; Result.Sentence[I].Note[J].Start := Lines.Line[I].Note[J].Start; - Result.Sentence[I].Note[J].Length := Lines.Line[I].Note[J].Dlugosc; - Result.Sentence[I].Note[J].Ton := Lines.Line[I].Note[J].Ton; + Result.Sentence[I].Note[J].Length := Lines.Line[I].Note[J].Lenght; + Result.Sentence[I].Note[J].Ton := Lines.Line[I].Note[J].Tone; Result.Sentence[I].Note[J].TonGamy := Lines.Line[I].Note[J].TonGamy; //Result.Sentence[I].Note[J].Text := Lines.Line[I].Note[J].Tekst; Result.Sentence[I].Note[J].FreeStyle := Lines.Line[I].Note[J].FreeStyle; - Result.Sentence[I].Note[J].Typ := Lines.Line[I].Note[J].Wartosc; + Result.Sentence[I].Note[J].Typ := Lines.Line[I].Note[J].NoteType; end; end; end; -- cgit v1.2.3