aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Game/Code/Classes/TextGL.pas32
-rw-r--r--Game/Code/Classes/UCommandLine.pas2
-rw-r--r--Game/Code/Classes/UFiles.pas18
-rw-r--r--Game/Code/Classes/UMain.pas114
-rw-r--r--Game/Code/Classes/UMusic.pas2
-rw-r--r--Game/Code/Classes/USong.pas86
-rw-r--r--Game/Code/Screens/UScreenEditConvert.pas4
-rw-r--r--Game/Code/Screens/UScreenEditHeader.pas100
-rw-r--r--Game/Code/Screens/UScreenEditSub.pas192
-rw-r--r--Game/Code/Screens/UScreenSingModi.pas38
10 files changed, 294 insertions, 294 deletions
diff --git a/Game/Code/Classes/TextGL.pas b/Game/Code/Classes/TextGL.pas
index f6c04b3a..c29648c3 100644
--- a/Game/Code/Classes/TextGL.pas
+++ b/Game/Code/Classes/TextGL.pas
@@ -109,14 +109,14 @@ procedure BuildFont; // Build Our Bitmap Font
{$ELSE}
var
- Rejestr: TResourceStream;
+ Reg: TResourceStream;
begin
try
- Rejestr := TResourceStream.Create(HInstance, aResourceName , pchar( aType ) );
+ Reg := TResourceStream.Create(HInstance, aResourceName , pchar( aType ) );
try
- Rejestr.Read(Fonts[ aID ].Width, 256);
+ Reg.Read(Fonts[ aID ].Width, 256);
finally
- Rejestr.Free;
+ Reg.Free;
end;
{$ENDIF}
@@ -126,7 +126,7 @@ procedure BuildFont; // Build Our Bitmap Font
end;
var
- Pet: integer;
+ Count: integer;
begin
ActFont := 0;
@@ -175,21 +175,21 @@ begin
loadfont( 2, 'FNT', 'FontO' );
loadfont( 3, 'FNT', 'FontO2' );
-{ Rejestr := TResourceStream.Create(HInstance, 'FontO', 'FNT');
- Rejestr.Read(Fonts[4].Width, 256);
- Rejestr.Free;}
+{ Reg := TResourceStream.Create(HInstance, 'FontO', 'FNT');
+ Reg.Read(Fonts[4].Width, 256);
+ Reg.Free;}
- for Pet := 0 to 255 do
- Fonts[1].Width[Pet] := Fonts[1].Width[Pet] div 2;
+ for Count := 0 to 255 do
+ Fonts[1].Width[Count] := Fonts[1].Width[Count] div 2;
- for Pet := 0 to 255 do
- Fonts[2].Width[Pet] := Fonts[2].Width[Pet] div 2 + 2;
+ for Count := 0 to 255 do
+ Fonts[2].Width[Count] := Fonts[2].Width[Count] div 2 + 2;
- for Pet := 0 to 255 do
- Fonts[3].Width[Pet] := Fonts[3].Width[Pet] + 1;
+ for Count := 0 to 255 do
+ Fonts[3].Width[Count] := Fonts[3].Width[Count] + 1;
-{ for Pet := 0 to 255 do
- Fonts[4].Width[Pet] := Fonts[4].Width[Pet] div 2 + 2;}
+{ for Count := 0 to 255 do
+ Fonts[4].Width[Count] := Fonts[4].Width[Count] div 2 + 2;}
end;
diff --git a/Game/Code/Classes/UCommandLine.pas b/Game/Code/Classes/UCommandLine.pas
index 55dfc6ce..92163f89 100644
--- a/Game/Code/Classes/UCommandLine.pas
+++ b/Game/Code/Classes/UCommandLine.pas
@@ -11,7 +11,7 @@ interface
type
//-----------
- // TCMDParams - Class Reaads Infos from ParamStr and set some easy Interface Variables
+ // TCMDParams - Class Reads Infos from ParamStr and set some easy Interface Variables
//-----------
TCMDParams = class
private
diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas
index def74c70..8d3a1c42 100644
--- a/Game/Code/Classes/UFiles.pas
+++ b/Game/Code/Classes/UFiles.pas
@@ -38,17 +38,17 @@ uses TextGL,
//--------------------
procedure ResetSingTemp;
var
- Pet: integer;
+ Count: integer;
begin
SetLength(Lines, Length(Player));
- for Pet := 0 to High(Player) do begin
- SetLength(Lines[Pet].Line, 1);
- SetLength(Lines[Pet].Line[0].Note, 0);
- Lines[Pet].Line[0].Lyric := '';
- Lines[Pet].Line[0].LyricWidth := 0;
- Player[pet].Score := 0;
- Player[pet].IlNut := 0;
- Player[pet].HighNote := -1;
+ for Count := 0 to High(Player) do begin
+ SetLength(Lines[Count].Line, 1);
+ SetLength(Lines[Count].Line[0].Note, 0);
+ Lines[Count].Line[0].Lyric := '';
+ Lines[Count].Line[0].LyricWidth := 0;
+ Player[Count].Score := 0;
+ Player[Count].IlNut := 0;
+ Player[Count].HighNote := -1;
end;
(* FIXME
diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index dc76429d..67690706 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -56,13 +56,13 @@ type
//Meter: real;
HighNote: integer;
- IlNut: integer;
+ IlNut: integer;
Note: array of record
- Start: integer;
+ Start: integer;
Lenght: integer;
- Detekt: real; // accurate place, detected in the note
- Tone: real;
- Perfect: boolean; // true if the note matches the original one, lit the star
+ Detekt: real; // accurate place, detected in the note
+ Tone: real;
+ Perfect: boolean; // true if the note matches the original one, lit the star
// Half size Notes Patch
Hit: boolean; // true if the note Hits the Line
@@ -676,11 +676,11 @@ end;
procedure Sing(Sender: TScreenSing);
var
- Pet: integer;
- PetGr: integer;
- CP: integer;
- Done: real;
- N: integer;
+ Count: integer;
+ CountGr: integer;
+ CP: integer;
+ Done: real;
+ N: integer;
begin
LineState.CurrentTime := LineState.CurrentTime + TimeSkip;
@@ -702,17 +702,17 @@ begin
LineState.FracBeatD := Frac(LineState.MidBeatD);
// sentences routines
- for PetGr := 0 to 0 do //High(Gracz)
+ for CountGr := 0 to 0 do //High(Gracz)
begin;
- CP := PetGr;
+ CP := CountGr;
// ustawianie starej parts
LineState.OldLine := Lines[CP].Current;
// wybieranie aktualnej parts
- for Pet := 0 to Lines[CP].High do
+ for Count := 0 to Lines[CP].High do
begin
- if LineState.CurrentBeat >= Lines[CP].Line[Pet].Start then
- Lines[CP].Current := Pet;
+ if LineState.CurrentBeat >= Lines[CP].Line[Count].Start then
+ Lines[CP].Current := Count;
end;
// czysczenie nut gracza, gdy to jest nowa plansza
@@ -720,7 +720,7 @@ begin
if Lines[CP].Current <> LineState.OldLine then
NewSentence(Sender);
- end; // for PetGr
+ end; // for CountGr
// wykonuje operacje raz na beat
if (LineState.CurrentBeat >= 0) and (LineState.OldBeat <> LineState.CurrentBeat) then
@@ -803,17 +803,17 @@ end;
procedure NewBeat(Sender: TScreenSing);
var
- Pet: integer;
+ Count: integer;
// TempBeat: integer;
begin
// ustawia zaznaczenie tekstu
// SingScreen.LyricMain.Selected := -1;
- for Pet := 0 to Lines[0].Line[Lines[0].Current].HighNote do
- if (Lines[0].Line[Lines[0].Current].Note[Pet].Start = LineState.CurrentBeat) then
+ for Count := 0 to Lines[0].Line[Lines[0].Current].HighNote do
+ if (Lines[0].Line[Lines[0].Current].Note[Count].Start = LineState.CurrentBeat) then
begin
// operates on currently beated note
//Todo: Lyrics
- //Sender.LyricMain.Selected := Pet;
+ //Sender.LyricMain.Selected := Count;
// LCD.MoveCursor(1, ScreenSing.LyricMain.SelectedLetter);
// LCD.ShowCursor;
@@ -825,7 +825,7 @@ end;
procedure NewBeatC;
var
- Pet: integer;
+ Count: integer;
// LPT_1: integer;
// LPT_2: integer;
begin
@@ -853,9 +853,9 @@ begin
Light.LightOne(1, 150)}
end;
- for Pet := 0 to Lines[0].Line[Lines[0].Current].HighNote do
+ for Count := 0 to Lines[0].Line[Lines[0].Current].HighNote do
begin
- if (Lines[0].Line[Lines[0].Current].Note[Pet].Start = LineState.CurrentBeatC) then
+ if (Lines[0].Line[Lines[0].Current].Note[Count].Start = LineState.CurrentBeatC) then
begin
// click assist
if Ini.ClickAssist = 1 then
@@ -898,9 +898,9 @@ var
SMin: integer;
SMax: integer;
SDet: integer; // temporary: sentence of detected note
- Pet: integer;
+ Count: integer;
Mozna: boolean;
- Nowa: boolean;
+ New: boolean;
Range: integer;
NoteHit:boolean;
begin
@@ -932,12 +932,12 @@ begin
SDet:=SMin;
for S := SMin to SMax do
begin
- for Pet := 0 to Lines[0].Line[S].HighNote do
+ for Count := 0 to Lines[0].Line[S].HighNote do
begin
- if ((Lines[0].Line[S].Note[Pet].Start <= LineState.CurrentBeatD)
- and (Lines[0].Line[S].Note[Pet].Start + Lines[0].Line[S].Note[Pet].Lenght - 1 >= LineState.CurrentBeatD))
- 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].Lenght > 0) then // and make sure the note lenghts is at least 1
+ if ((Lines[0].Line[S].Note[Count].Start <= LineState.CurrentBeatD)
+ and (Lines[0].Line[S].Note[Count].Start + Lines[0].Line[S].Note[Count].Lenght - 1 >= LineState.CurrentBeatD))
+ and (not Lines[0].Line[S].Note[Count].FreeStyle) // but don't allow when it's FreeStyle note
+ and (Lines[0].Line[S].Note[Count].Lenght > 0) then // and make sure the note lenghts is at least 1
begin
SDet := S;
Mozna := true;
@@ -951,23 +951,23 @@ begin
//Czas.SzczytJest := true;
//Czas.Tone := 27;
- // gdy moze, to dodaje nute
+ // gdy moze, to dodaje nute - When Mozna, it adds note (?)
if (AudioInputProcessor.Sound[CP].ToneValid) and (Mozna) then
begin
// operowanie na ostatniej nucie
- for Pet := 0 to Lines[0].Line[S].HighNote do
+ for Count := 0 to Lines[0].Line[S].HighNote do
begin
- if (Lines[0].Line[S].Note[Pet].Start <= LineState.OldBeatD+1) and
- (Lines[0].Line[S].Note[Pet].Start +
- Lines[0].Line[S].Note[Pet].Lenght > LineState.OldBeatD+1) then
+ if (Lines[0].Line[S].Note[Count].Start <= LineState.OldBeatD+1) and
+ (Lines[0].Line[S].Note[Count].Start +
+ Lines[0].Line[S].Note[Count].Lenght > LineState.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].Tone > 6) do
+ while (AudioInputProcessor.Sound[CP].Tone - Lines[0].Line[S].Note[Count].Tone > 6) do
AudioInputProcessor.Sound[CP].Tone := AudioInputProcessor.Sound[CP].Tone - 12;
- while (AudioInputProcessor.Sound[CP].Tone - Lines[0].Line[S].Note[Pet].Tone < -6) do
+ while (AudioInputProcessor.Sound[CP].Tone - Lines[0].Line[S].Note[Count].Tone < -6) do
AudioInputProcessor.Sound[CP].Tone := AudioInputProcessor.Sound[CP].Tone + 12;
// Half size Notes Patch
@@ -978,9 +978,9 @@ begin
//if Ini.Difficulty = 2 then Range := 0;
Range := 2 - Ini.Difficulty;
- if abs(Lines[0].Line[S].Note[Pet].Tone - AudioInputProcessor.Sound[CP].Tone) <= Range then
+ if abs(Lines[0].Line[S].Note[Count].Tone - AudioInputProcessor.Sound[CP].Tone) <= Range then
begin
- AudioInputProcessor.Sound[CP].Tone := Lines[0].Line[S].Note[Pet].Tone;
+ AudioInputProcessor.Sound[CP].Tone := Lines[0].Line[S].Note[Count].Tone;
// Half size Notes Patch
NoteHit := true;
@@ -988,21 +988,21 @@ begin
if (Ini.LineBonus = 0) then
begin
// add points without LineBonus
- case Lines[0].Line[S].Note[Pet].NoteType of
+ case Lines[0].Line[S].Note[Count].NoteType of
1: Player[CP].Score := Player[CP].Score + 10000 / Lines[0].NoteType *
- Lines[0].Line[S].Note[Pet].NoteType;
+ Lines[0].Line[S].Note[Count].NoteType;
2: Player[CP].ScoreGolden := Player[CP].ScoreGolden + 10000 / Lines[0].NoteType *
- Lines[0].Line[S].Note[Pet].NoteType;
+ Lines[0].Line[S].Note[Count].NoteType;
end;
end
else
begin
// add points with Line Bonus
- case Lines[0].Line[S].Note[Pet].NoteType of
+ case Lines[0].Line[S].Note[Count].NoteType of
1: Player[CP].Score := Player[CP].Score + 9000 / Lines[0].NoteType *
- Lines[0].Line[S].Note[Pet].NoteType;
+ Lines[0].Line[S].Note[Count].NoteType;
2: Player[CP].ScoreGolden := Player[CP].ScoreGolden + 9000 / Lines[0].NoteType *
- Lines[0].Line[S].Note[Pet].NoteType;
+ Lines[0].Line[S].Note[Count].NoteType;
end;
end;
@@ -1018,26 +1018,26 @@ begin
// sprawdzanie czy to nowa nuta, czy przedluzenie
if S = SMax then
begin
- Nowa := true;
+ New := true;
// jezeli ostatnia ma ten sam Tone
if (Player[CP].IlNut > 0 ) and
(Player[CP].Note[Player[CP].HighNote].Tone = AudioInputProcessor.Sound[CP].Tone) and
(Player[CP].Note[Player[CP].HighNote].Start + Player[CP].Note[Player[CP].HighNote].Lenght = LineState.CurrentBeatD) then
begin
- Nowa := false;
+ New := false;
end;
// jezeli jest jakas nowa nuta na sprawdzanym beacie
- for Pet := 0 to Lines[0].Line[S].HighNote do
+ for Count := 0 to Lines[0].Line[S].HighNote do
begin
- if (Lines[0].Line[S].Note[Pet].Start = LineState.CurrentBeatD) then
- Nowa := true;
+ if (Lines[0].Line[S].Note[Count].Start = LineState.CurrentBeatD) then
+ New := true;
end;
// dodawanie nowej nuty
- if Nowa then
+ if New then
begin
- // nowa nuta
+ // New Note
Player[CP].IlNut := Player[CP].IlNut + 1;
Player[CP].HighNote := Player[CP].HighNote + 1;
SetLength(Player[CP].Note, Player[CP].IlNut);
@@ -1049,7 +1049,7 @@ begin
// Half Note Patch
Player[CP].Note[Player[CP].HighNote].Hit := NoteHit;
- //Log.LogStatus('Nowa Nuta ' + IntToStr(Gracz.Note[Gracz.HighNote].Start), 'NewBeat');
+ //Log.LogStatus('New Note ' + IntToStr(Gracz.Note[Gracz.HighNote].Start), 'NewBeat');
end
else
begin
@@ -1058,11 +1058,11 @@ begin
end;
// check for perfect note and then lit the star (on Draw)
- for Pet := 0 to Lines[0].Line[S].HighNote do
+ for Count := 0 to Lines[0].Line[S].HighNote do
begin
- if (Lines[0].Line[S].Note[Pet].Start = Player[CP].Note[Player[CP].HighNote].Start) and
- (Lines[0].Line[S].Note[Pet].Lenght = Player[CP].Note[Player[CP].HighNote].Lenght) and
- (Lines[0].Line[S].Note[Pet].Tone = Player[CP].Note[Player[CP].HighNote].Tone) then
+ if (Lines[0].Line[S].Note[Count].Start = Player[CP].Note[Player[CP].HighNote].Start) and
+ (Lines[0].Line[S].Note[Count].Lenght = Player[CP].Note[Player[CP].HighNote].Lenght) and
+ (Lines[0].Line[S].Note[Count].Tone = Player[CP].Note[Player[CP].HighNote].Tone) then
begin
Player[CP].Note[Player[CP].HighNote].Perfect := true;
end;
diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas
index 956e0372..699cfa23 100644
--- a/Game/Code/Classes/UMusic.pas
+++ b/Game/Code/Classes/UMusic.pas
@@ -51,7 +51,7 @@ type
TLines = record
Current: integer; // for drawing of current line
High: integer;
- Ilosc: integer; // (TODO: Ilosc = Number/Count)
+ Number: integer;
Resolution: integer;
NotesGAP: integer;
NoteType: integer;
diff --git a/Game/Code/Classes/USong.pas b/Game/Code/Classes/USong.pas
index a97ea1c9..1196e995 100644
--- a/Game/Code/Classes/USong.pas
+++ b/Game/Code/Classes/USong.pas
@@ -50,8 +50,8 @@ type
TSong = class
FileLineNo : integer; //Line which is readed at Last, for error reporting
- procedure ParseNote(NrCzesci: integer; TypeP: char; StartP, DurationP, NoteP: integer; LyricS: string);
- procedure NewSentence(NrCzesciP: integer; Param1, Param2: integer);
+ procedure ParseNote(LineNumber: integer; TypeP: char; StartP, DurationP, NoteP: integer; LyricS: string);
+ procedure NewSentence(LineNumberP: integer; Param1, Param2: integer);
function ReadTXTHeader( const aFileName : WideString ): boolean;
public
@@ -114,7 +114,7 @@ implementation
uses
TextGL,
UIni,
- UMusic, // needed for Lines .. ( whatever that is )
+ UMusic, //needed for Lines
UMain; //needed for Player
constructor TSong.create( const aFileName : WideString );
@@ -160,9 +160,9 @@ function TSong.LoadSong(): boolean;
var
TempC: char;
- Tekst: string;
+ Text: string;
CP: integer; // Current Player (0 or 1)
- Pet: integer;
+ Count: integer;
Both: boolean;
Param1: integer;
Param2: integer;
@@ -209,7 +209,7 @@ begin
FileLineNo := 0;
//Search for Note Begining
repeat
- ReadLn(SongFile, Tekst);
+ ReadLn(SongFile, Text);
Inc(FileLineNo);
if (EoF(SongFile)) then
@@ -223,19 +223,19 @@ begin
until ((TempC = ':') or (TempC = 'F') or (TempC = '*'));
SetLength(Lines, 2);
- for Pet := 0 to High(Lines) do begin
- SetLength(Lines[Pet].Line, 1);
- Lines[Pet].High := 0;
- Lines[Pet].Ilosc := 1;
- Lines[Pet].Current := 0;
- Lines[Pet].Resolution := self.Resolution;
- Lines[Pet].NotesGAP := self.NotesGAP;
- Lines[Pet].Line[0].IlNut := 0;
- Lines[Pet].Line[0].HighNote := -1;
+ for Count := 0 to High(Lines) do begin
+ SetLength(Lines[Count].Line, 1);
+ Lines[Count].High := 0;
+ Lines[Count].Number := 1;
+ Lines[Count].Current := 0;
+ Lines[Count].Resolution := self.Resolution;
+ Lines[Count].NotesGAP := self.NotesGAP;
+ Lines[Count].Line[0].IlNut := 0;
+ Lines[Count].Line[0].HighNote := -1;
end;
// TempC := ':';
- // TempC := Tekst[1]; // read from backup variable, don't use default ':' value
+ // TempC := Text[1]; // read from backup variable, don't use default ':' value
while (TempC <> 'E') AND (not EOF(SongFile)) do
begin
@@ -281,8 +281,8 @@ begin
Read(SongFile, self.BPM[High(self.BPM)].StartBeat);
self.BPM[High(self.BPM)].StartBeat := self.BPM[High(self.BPM)].StartBeat + Rel[0];
- Read(SongFile, Tekst);
- self.BPM[High(self.BPM)].BPM := StrToFloat(Tekst);
+ Read(SongFile, Text);
+ self.BPM[High(self.BPM)].BPM := StrToFloat(Text);
self.BPM[High(self.BPM)].BPM := self.BPM[High(self.BPM)].BPM * Mult * MultBPM;
end;
@@ -299,14 +299,14 @@ begin
end;
//Total Notes Patch End
end else begin
- for Pet := 0 to High(Lines) do begin
- Lines[Pet].Line[Lines[Pet].High].BaseNote := Base[Pet];
- Lines[Pet].Line[Lines[Pet].High].LyricWidth := glTextWidth(PChar(Lines[Pet].Line[Lines[Pet].High].Lyric));
+ for Count := 0 to High(Lines) do begin
+ Lines[Count].Line[Lines[Count].High].BaseNote := Base[Count];
+ Lines[Count].Line[Lines[Count].High].LyricWidth := glTextWidth(PChar(Lines[Count].Line[Lines[Count].High].Lyric));
//Total Notes Patch
- 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
+ Lines[Count].Line[Lines[Count].High].TotalNotes := 0;
+ for I := low(Lines[Count].Line[Lines[Count].High].Note) to high(Lines[Count].Line[Lines[Count].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].Lenght * Lines[Pet].Line[Lines[Pet].High].Note[I].NoteType;
+ Lines[Count].Line[Lines[Count].High].TotalNotes := Lines[Count].Line[Lines[Count].High].TotalNotes + Lines[Count].Line[Lines[Count].High].Note[I].Lenght * Lines[Count].Line[Lines[Count].High].Note[I].NoteType;
end;
//Total Notes Patch End
end;
@@ -535,7 +535,7 @@ begin
end;
-procedure TSong.ParseNote(NrCzesci: integer; TypeP: char; StartP, DurationP, NoteP: integer; LyricS: string);
+procedure TSong.ParseNote(LineNumber: integer; TypeP: char; StartP, DurationP, NoteP: integer; LyricS: string);
var
Space: boolean;
begin
@@ -578,7 +578,7 @@ begin
end;
end; // case
- with Lines[NrCzesci].Line[Lines[NrCzesci].High] do begin
+ with Lines[LineNumber].Line[Lines[LineNumber].High] do begin
SetLength(Note, Length(Note) + 1);
IlNut := IlNut + 1;
HighNote := HighNote + 1;
@@ -587,7 +587,7 @@ begin
Note[HighNote].Start := StartP;
if IlNut = 1 then begin
StartNote := Note[HighNote].Start;
- if Lines[NrCzesci].Ilosc = 1 then
+ if Lines[LineNumber].Number = 1 then
Start := -100;
// Start := Note[HighNote].Start;
end;
@@ -602,10 +602,10 @@ begin
'*': Note[HighNote].NoteType := 2;
end;
- Lines[NrCzesci].NoteType := Lines[NrCzesci].NoteType + Note[HighNote].Lenght * Note[HighNote].NoteType;
+ Lines[LineNumber].NoteType := Lines[LineNumber].NoteType + Note[HighNote].Lenght * Note[HighNote].NoteType;
Note[HighNote].Tone := NoteP;
- if Note[HighNote].Tone < Base[NrCzesci] then Base[NrCzesci] := Note[HighNote].Tone;
+ if Note[HighNote].Tone < Base[LineNumber] then Base[LineNumber] := Note[HighNote].Tone;
Note[HighNote].ToneGamus := Note[HighNote].ToneGamus mod 12;
Note[HighNote].Text := Copy(LyricS, 2, 100);
@@ -618,39 +618,39 @@ begin
end; // with
end;
-procedure TSong.NewSentence(NrCzesciP: integer; Param1, Param2: integer);
+procedure TSong.NewSentence(LineNumberP: integer; Param1, Param2: integer);
var
I: Integer;
begin
// stara czesc //Alter Satz //Update Old Part
- Lines[NrCzesciP].Line[Lines[NrCzesciP].High].BaseNote := Base[NrCzesciP];
- Lines[NrCzesciP].Line[Lines[NrCzesciP].High].LyricWidth := glTextWidth(PChar(Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Lyric));
+ Lines[LineNumberP].Line[Lines[LineNumberP].High].BaseNote := Base[LineNumberP];
+ Lines[LineNumberP].Line[Lines[LineNumberP].High].LyricWidth := glTextWidth(PChar(Lines[LineNumberP].Line[Lines[LineNumberP].High].Lyric));
//Total Notes Patch
- 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
+ Lines[LineNumberP].Line[Lines[LineNumberP].High].TotalNotes := 0;
+ for I := low(Lines[LineNumberP].Line[Lines[LineNumberP].High].Note) to high(Lines[LineNumberP].Line[Lines[LineNumberP].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].Lenght * Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Note[I].NoteType;
+ Lines[LineNumberP].Line[Lines[LineNumberP].High].TotalNotes := Lines[LineNumberP].Line[Lines[LineNumberP].High].TotalNotes + Lines[LineNumberP].Line[Lines[LineNumberP].High].Note[I].Lenght * Lines[LineNumberP].Line[Lines[LineNumberP].High].Note[I].NoteType;
end;
//Total Notes Patch End
// nowa czesc //Neuer Satz //Update New Part
- SetLength(Lines[NrCzesciP].Line, Lines[NrCzesciP].Ilosc + 1);
- Lines[NrCzesciP].High := Lines[NrCzesciP].High + 1;
- Lines[NrCzesciP].Ilosc := Lines[NrCzesciP].Ilosc + 1;
- Lines[NrCzesciP].Line[Lines[NrCzesciP].High].HighNote := -1;
+ SetLength(Lines[LineNumberP].Line, Lines[LineNumberP].Number + 1);
+ Lines[LineNumberP].High := Lines[LineNumberP].High + 1;
+ Lines[LineNumberP].Number := Lines[LineNumberP].Number + 1;
+ Lines[LineNumberP].Line[Lines[LineNumberP].High].HighNote := -1;
if self.Relative then
begin
- Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Start := Param1;
- Rel[NrCzesciP] := Rel[NrCzesciP] + Param2;
+ Lines[LineNumberP].Line[Lines[LineNumberP].High].Start := Param1;
+ Rel[LineNumberP] := Rel[LineNumberP] + Param2;
end
else
- Lines[NrCzesciP].Line[Lines[NrCzesciP].High].Start := Param1;
+ Lines[LineNumberP].Line[Lines[LineNumberP].High].Start := Param1;
- Base[NrCzesciP] := 100; // high number
+ Base[LineNumberP] := 100; // high number
end;
procedure TSong.clear();
diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas
index 75f5b3b7..ed99e63e 100644
--- a/Game/Code/Screens/UScreenEditConvert.pas
+++ b/Game/Code/Screens/UScreenEditConvert.pas
@@ -293,7 +293,7 @@ begin
// copy notes
SetLength(Lines.Line, 1);
- Lines.Ilosc := 1;
+ Lines.Number := 1;
Lines.High := 0;
C := 0;
@@ -304,7 +304,7 @@ begin
for Nu := 0 to High(Note) do begin
if Note[Nu].NewSentence then begin // nowa linijka
SetLength(Lines.Line, Length(Lines.Line)+1);
- Lines.Ilosc := Lines.Ilosc + 1;
+ Lines.Number := Lines.Number + 1;
Lines.High := Lines.High + 1;
C := C + 1;
N := 0;
diff --git a/Game/Code/Screens/UScreenEditHeader.pas b/Game/Code/Screens/UScreenEditHeader.pas
index 440db00e..19795e40 100644
--- a/Game/Code/Screens/UScreenEditHeader.pas
+++ b/Game/Code/Screens/UScreenEditHeader.pas
@@ -13,20 +13,20 @@ uses UMenu,
type
TScreenEditHeader = class(TMenu)
public
- AktSong: TSong;
- TextTitle: integer;
- TextArtist: integer;
- TextMp3: integer;
- TextBackground: integer;
- TextVideo: integer;
- TextVideoGAP: integer;
- TextRelative: integer;
- TextResolution: integer;
- TextNotesGAP: integer;
- TextStart: integer;
- TextGAP: integer;
- TextBPM: integer;
- StaticTitle: integer;
+ CurrentSong: TSong;
+ TextTitle: integer;
+ TextArtist: integer;
+ TextMp3: integer;
+ TextBackground: integer;
+ TextVideo: integer;
+ TextVideoGAP: integer;
+ TextRelative: integer;
+ TextResolution: integer;
+ TextNotesGAP: integer;
+ TextStart: integer;
+ TextGAP: integer;
+ TextBPM: integer;
+ StaticTitle: integer;
StaticArtist: integer;
StaticMp3: integer;
StaticBackground: integer;
@@ -38,7 +38,7 @@ type
StaticStart: integer;
StaticGAP: integer;
StaticBPM: integer;
- Sel: array[0..11] of boolean;
+ Sel: array[0..11] of boolean;
procedure SetRoundButtons;
constructor Create; override;
@@ -163,34 +163,34 @@ begin
AddText(160, 110 + 13*30, 0, 10, 0, 0, 0, 'GAP:');
AddText(160, 110 + 14*30, 0, 10, 0, 0, 0, 'BPM:');
- TextTitle := AddText(340, 110 + 0*30, 0, 10, 0, 0, 0, '');
+ TextTitle := AddText(340, 110 + 0*30, 0, 10, 0, 0, 0, '');
TextArtist := AddText(340, 110 + 1*30, 0, 10, 0, 0, 0, '');
- TextMp3 := AddText(340, 110 + 2*30, 0, 10, 0, 0, 0, '');
+ TextMp3 := AddText(340, 110 + 2*30, 0, 10, 0, 0, 0, '');
TextBackground := AddText(340, 110 + 4*30, 0, 10, 0, 0, 0, '');
- TextVideo := AddText(340, 110 + 5*30, 0, 10, 0, 0, 0, '');
- TextVideoGAP := AddText(340, 110 + 6*30, 0, 10, 0, 0, 0, '');
+ TextVideo := AddText(340, 110 + 5*30, 0, 10, 0, 0, 0, '');
+ TextVideoGAP := AddText(340, 110 + 6*30, 0, 10, 0, 0, 0, '');
- TextRelative := AddText(340, 110 + 8*30, 0, 10, 0, 0, 0, '');
+ TextRelative := AddText(340, 110 + 8*30, 0, 10, 0, 0, 0, '');
TextResolution := AddText(340, 110 + 9*30, 0, 10, 0, 0, 0, '');
- TextNotesGAP := AddText(340, 110 + 10*30, 0, 10, 0, 0, 0, '');
+ TextNotesGAP := AddText(340, 110 + 10*30, 0, 10, 0, 0, 0, '');
TextStart := AddText(340, 110 + 12*30, 0, 10, 0, 0, 0, '');
- TextGAP := AddText(340, 110 + 13*30, 0, 10, 0, 0, 0, '');
- TextBPM := AddText(340, 110 + 14*30, 0, 10, 0, 0, 0, '');
+ TextGAP := AddText(340, 110 + 13*30, 0, 10, 0, 0, 0, '');
+ TextBPM := AddText(340, 110 + 14*30, 0, 10, 0, 0, 0, '');
- StaticTitle := AddStatic(130, 115 + 0*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
- StaticArtist := AddStatic(130, 115 + 1*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
- StaticMp3 := AddStatic(130, 115 + 2*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticTitle := AddStatic(130, 115 + 0*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticArtist := AddStatic(130, 115 + 1*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticMp3 := AddStatic(130, 115 + 2*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
StaticBackground := AddStatic(130, 115 + 4*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
- StaticVideo := AddStatic(130, 115 + 5*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
- StaticVideoGAP := AddStatic(130, 115 + 6*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
- StaticRelative := AddStatic(130, 115 + 8*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticVideo := AddStatic(130, 115 + 5*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticVideoGAP := AddStatic(130, 115 + 6*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticRelative := AddStatic(130, 115 + 8*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
StaticResolution := AddStatic(130, 115 + 9*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
- StaticNotesGAP := AddStatic(130, 115 + 10*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
- StaticStart := AddStatic(130, 115 + 12*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
- StaticGAP := AddStatic(130, 115 + 13*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
- StaticBPM := AddStatic(130, 115 + 14*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticNotesGAP := AddStatic(130, 115 + 10*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticStart := AddStatic(130, 115 + 12*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticGAP := AddStatic(130, 115 + 13*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
+ StaticBPM := AddStatic(130, 115 + 14*30, 20, 20, 1, 1, 1, 'RoundButton', 'BMP', 'Transparent', $FF00FF);
AddInteraction(iText, TextTitle);
AddInteraction(iText, TextArtist);
@@ -211,26 +211,26 @@ begin
inherited;
{ if FileExists(FileName) then begin // load file
- AktSong.FileName := FileName;
- SkanujPlik(AktSong);
+ CurrentSong.FileName := FileName;
+ SkanujPlik(CurrentSong);
SetLength(TrueBoolStrs, 1);
TrueBoolStrs[0] := 'yes';
SetLength(FalseBoolStrs, 1);
FalseBoolStrs[0] := 'no';
- Text[TextTitle].Text := AktSong.Title;
- Text[TextArtist].Text := AktSong.Artist;
- Text[TextMP3].Text := AktSong.Mp3;
- Text[TextBackground].Text := AktSong.Background;
- Text[TextVideo].Text := AktSong.Video;
- Text[TextVideoGAP].Text := FloatToStr(AktSong.VideoGAP);
- Text[TextRelative].Text := BoolToStr(AktSong.Relative, true);
- Text[TextResolution].Text := IntToStr(AktSong.Resolution);
- Text[TextNotesGAP].Text := IntToStr(AktSong.NotesGAP);
- Text[TextStart].Text := FloatToStr(AktSong.Start);
- Text[TextGAP].Text := FloatToStr(AktSong.GAP);
- Text[TextBPM].Text := FloatToStr(AktSong.BPM[0].BPM);
+ Text[TextTitle].Text := CurrentSong.Title;
+ Text[TextArtist].Text := CurrentSong.Artist;
+ Text[TextMP3].Text := CurrentSong.Mp3;
+ Text[TextBackground].Text := CurrentSong.Background;
+ Text[TextVideo].Text := CurrentSong.Video;
+ Text[TextVideoGAP].Text := FloatToStr(CurrentSong.VideoGAP);
+ Text[TextRelative].Text := BoolToStr(CurrentSong.Relative, true);
+ Text[TextResolution].Text := IntToStr(CurrentSong.Resolution);
+ Text[TextNotesGAP].Text := IntToStr(CurrentSong.NotesGAP);
+ Text[TextStart].Text := FloatToStr(CurrentSong.Start);
+ Text[TextGAP].Text := FloatToStr(CurrentSong.GAP);
+ Text[TextBPM].Text := FloatToStr(CurrentSong.BPM[0].BPM);
SetRoundButtons;
end;}
@@ -257,7 +257,7 @@ begin
// click
if (Click) and (PlaySentence) then begin
- AktBeat := Floor(AktSong.BPM[0].BPM * (Music.Position - AktSong.GAP / 1000) / 60);
+ AktBeat := Floor(CurrentSong.BPM[0].BPM * (Music.Position - CurrentSong.GAP / 1000) / 60);
Text[TextDebug].Text := IntToStr(AktBeat);
if AktBeat <> LastClick then begin
for Pet := 0 to Czesci[0].Czesc[Czesci[0].Akt].HighNut do
@@ -273,8 +273,8 @@ begin
Text[TextNote].Text := IntToStr(AktNuta + 1) + ' / ' + IntToStr(Czesci[0].Czesc[Czesci[0].Akt].IlNut);
// Song info
- Text[TextBPM].Text := FloatToStr(AktSong.BPM[0].BPM / 4);
- Text[TextGAP].Text := FloatToStr(AktSong.GAP);
+ Text[TextBPM].Text := FloatToStr(CurrentSong.BPM[0].BPM / 4);
+ Text[TextGAP].Text := FloatToStr(CurrentSong.GAP);
// Note info
Text[TextNStart].Text := IntToStr(Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Start);
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 94bb6a59..b9b76db6 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -32,7 +32,7 @@ uses
type
TScreenEditSub = class(TMenu)
private
- //Variable is True if no SOng is loaded
+ //Variable is True if no Song is loaded
Error: Boolean;
TextNote: integer;
@@ -47,7 +47,7 @@ type
TextNDlugosc: integer;
TextNTon: integer;
TextNText: integer;
- AktNuta: integer;
+ CurrentNote: integer;
PlaySentence: boolean;
PlaySentenceMidi: boolean;
PlayStopTime: real;
@@ -134,8 +134,8 @@ begin
SDLK_BACKQUOTE:
begin
// Increase Note Length (same as Alt + Right)
- Inc(Lines[0].Line[Lines[0].Current].Note[AktNuta].Lenght);
- if AktNuta = Lines[0].Line[Lines[0].Current].HighNote then
+ Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+ if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
Inc(Lines[0].Line[Lines[0].Current].End_);
end;
@@ -201,7 +201,7 @@ begin
begin
if SDL_ModState = 0 then begin
// Insert start of sentece
- if AktNuta > 0 then
+ if CurrentNote > 0 then
DivideSentence;
end;
@@ -364,10 +364,10 @@ begin
PlaySentence := true;
Click := false;
AudioPlayback.Stop;
- AudioPlayback.Position := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].Note[AktNuta].Start);
+ AudioPlayback.Position := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
PlayStopTime := (GetTimeFromBeat(
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Start +
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Lenght));
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start +
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght));
AudioPlayback.Play;
LastClick := -100;
end;
@@ -398,19 +398,19 @@ begin
begin
// right
if SDL_ModState = 0 then begin
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 0;
- Inc(AktNuta);
- if AktNuta = Lines[0].Line[Lines[0].Current].IlNut then AktNuta := 0;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 1;
- Lyric.Selected := AktNuta;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
+ Inc(CurrentNote);
+ if CurrentNote = Lines[0].Line[Lines[0].Current].IlNut then CurrentNote := 0;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
+ Lyric.Selected := CurrentNote;
end;
// ctrl + right
if SDL_ModState = KMOD_LCTRL then begin
- if Lines[0].Line[Lines[0].Current].Note[AktNuta].Lenght > 1 then begin
- Dec(Lines[0].Line[Lines[0].Current].Note[AktNuta].Lenght);
- Inc(Lines[0].Line[Lines[0].Current].Note[AktNuta].Start);
- if AktNuta = 0 then begin
+ if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght > 1 then begin
+ Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+ Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
+ if CurrentNote = 0 then begin
Inc(Lines[0].Line[Lines[0].Current].Start);
Inc(Lines[0].Line[Lines[0].Current].StartNote);
end;
@@ -419,19 +419,19 @@ begin
// shift + right
if SDL_ModState = KMOD_LSHIFT then begin
- Inc(Lines[0].Line[Lines[0].Current].Note[AktNuta].Start);
- if AktNuta = 0 then begin
+ Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
+ if CurrentNote = 0 then begin
Inc(Lines[0].Line[Lines[0].Current].Start);
Inc(Lines[0].Line[Lines[0].Current].StartNote);
end;
- if AktNuta = Lines[0].Line[Lines[0].Current].HighNote then
+ if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
Inc(Lines[0].Line[Lines[0].Current].End_);
end;
// alt + right
if SDL_ModState = KMOD_LALT then begin
- Inc(Lines[0].Line[Lines[0].Current].Note[AktNuta].Lenght);
- if AktNuta = Lines[0].Line[Lines[0].Current].HighNote then
+ Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+ if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
Inc(Lines[0].Line[Lines[0].Current].End_);
end;
@@ -446,18 +446,18 @@ begin
begin
// left
if SDL_ModState = 0 then begin
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 0;
- Dec(AktNuta);
- if AktNuta = -1 then AktNuta := Lines[0].Line[Lines[0].Current].HighNote;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 1;
- Lyric.Selected := AktNuta;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
+ Dec(CurrentNote);
+ if CurrentNote = -1 then CurrentNote := Lines[0].Line[Lines[0].Current].HighNote;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
+ Lyric.Selected := CurrentNote;
end;
// ctrl + left
if SDL_ModState = KMOD_LCTRL then begin
- Dec(Lines[0].Line[Lines[0].Current].Note[AktNuta].Start);
- Inc(Lines[0].Line[Lines[0].Current].Note[AktNuta].Lenght);
- if AktNuta = 0 then begin
+ Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
+ Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+ if CurrentNote = 0 then begin
Dec(Lines[0].Line[Lines[0].Current].Start);
Dec(Lines[0].Line[Lines[0].Current].StartNote);
end;
@@ -465,24 +465,24 @@ begin
// shift + left
if SDL_ModState = KMOD_LSHIFT then begin
- Dec(Lines[0].Line[Lines[0].Current].Note[AktNuta].Start);
+ Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
// resizing sentences
- if AktNuta = 0 then begin
+ if CurrentNote = 0 then begin
Dec(Lines[0].Line[Lines[0].Current].Start);
Dec(Lines[0].Line[Lines[0].Current].StartNote);
end;
- if AktNuta = Lines[0].Line[Lines[0].Current].HighNote then
+ if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
Dec(Lines[0].Line[Lines[0].Current].End_);
end;
// alt + left
if SDL_ModState = KMOD_LALT then begin
- if Lines[0].Line[Lines[0].Current].Note[AktNuta].Lenght > 1 then begin
- Dec(Lines[0].Line[Lines[0].Current].Note[AktNuta].Lenght);
- if AktNuta = Lines[0].Line[Lines[0].Current].HighNote then
+ if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght > 1 then begin
+ Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+ if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
Dec(Lines[0].Line[Lines[0].Current].End_);
end;
end;
@@ -502,11 +502,11 @@ begin
MidiOut.PutShort($81, Lines[0].Line[Lines[0].Current].Note[MidiLastNote].Tone + 60, 127);
PlaySentenceMidi := false;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 0;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
Inc(Lines[0].Current);
- AktNuta := 0;
+ CurrentNote := 0;
if Lines[0].Current > Lines[0].High then Lines[0].Current := 0;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 1;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
Lyric.AddCzesc(Lines[0].Current);
Lyric.Selected := 0;
@@ -530,11 +530,11 @@ begin
MidiOut.PutShort($81, Lines[0].Line[Lines[0].Current].Note[MidiLastNote].Tone + 60, 127);
PlaySentenceMidi := false;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 0;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
Dec(Lines[0].Current);
- AktNuta := 0;
+ CurrentNote := 0;
if Lines[0].Current = -1 then Lines[0].Current := Lines[0].High;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 1;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
Lyric.AddCzesc(Lines[0].Current);
Lyric.Selected := 0;
@@ -552,27 +552,27 @@ begin
// Golden Note Patch
SDLK_G:
begin
- case Lines[0].Line[Lines[0].Current].Note[AktNuta].NoteType of
- 0: Lines[0].Line[Lines[0].Current].Note[AktNuta].NoteType := 2;
- 1: Lines[0].Line[Lines[0].Current].Note[AktNuta].NoteType := 2;
- 2: Lines[0].Line[Lines[0].Current].Note[AktNuta].NoteType := 1;
+ case Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType of
+ 0: Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType := 2;
+ 1: Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType := 2;
+ 2: Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType := 1;
end; // case
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Freestyle := False;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Freestyle := False;
end;
// Freestyle Note Patch
SDLK_F:
begin
- case Lines[0].Line[Lines[0].Current].Note[AktNuta].NoteType of
+ case Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType of
0:
begin;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].NoteType := 1;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Freestyle := False;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType := 1;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Freestyle := False;
end;
1,2:
begin;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].NoteType := 0;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Freestyle := True;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType := 0;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Freestyle := True;
end;
end; // case
@@ -609,34 +609,34 @@ 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].Current].Note[AktNuta].Text :=
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Text + chr(ScanCode);
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text :=
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text + chr(ScanCode);
end;
SDLK_BACKSPACE:
begin
- Delete(Lines[0].Line[Lines[0].Current].Note[AktNuta].Text,
- Length(Lines[0].Line[Lines[0].Current].Note[AktNuta].Text), 1);
+ Delete(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text,
+ Length(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text), 1);
end;
SDLK_RIGHT:
begin
// right
if SDL_ModState = 0 then begin
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 0;
- Inc(AktNuta);
- if AktNuta = Lines[0].Line[Lines[0].Current].IlNut then AktNuta := 0;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 1;
- Lyric.Selected := AktNuta;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
+ Inc(CurrentNote);
+ if CurrentNote = Lines[0].Line[Lines[0].Current].IlNut then CurrentNote := 0;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
+ Lyric.Selected := CurrentNote;
end;
end;
SDLK_LEFT:
begin
// left
if SDL_ModState = 0 then begin
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 0;
- Dec(AktNuta);
- if AktNuta = -1 then AktNuta := Lines[0].Line[Lines[0].Current].HighNote;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 1;
- Lyric.Selected := AktNuta;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 0;
+ Dec(CurrentNote);
+ if CurrentNote = -1 then CurrentNote := Lines[0].Line[Lines[0].Current].HighNote;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
+ Lyric.Selected := CurrentNote;
end;
end;
end;
@@ -790,7 +790,7 @@ begin
// increase sentence length by 1
CLen := Length(Lines[0].Line);
SetLength(Lines[0].Line, CLen + 1);
- Inc(Lines[0].Ilosc);
+ Inc(Lines[0].Number);
Inc(Lines[0].High);
// move needed sentences to one forward. newly has the copy of divided sentence
@@ -800,7 +800,7 @@ begin
// clear and set new sentence
CNew := CStart + 1;
- NStart := AktNuta;
+ NStart := CurrentNote;
Lines[0].Line[CNew].Start := Lines[0].Line[CStart].Note[NStart].Start;
Lines[0].Line[CNew].StartNote := Lines[0].Line[CStart].Note[NStart].Start;
Lines[0].Line[CNew].Lyric := '';
@@ -839,8 +839,8 @@ begin
Lines[0].Line[CNew].BaseNote := Lines[0].Line[CNew].Note[N].Tone;
Lines[0].Current := Lines[0].Current + 1;
- AktNuta := 0;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 1;
+ CurrentNote := 0;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
Lyric.AddCzesc(Lines[0].Current);
end;
@@ -877,7 +877,7 @@ begin
// increase sentence length by 1
SetLength(Lines[0].Line, Length(Lines[0].Line) - 1);
- Dec(Lines[0].Ilosc);
+ Dec(Lines[0].Number);
Dec(Lines[0].High);
end;
@@ -895,16 +895,16 @@ begin
Inc(Lines[0].Line[C].IlNut);
// we copy all notes including selected one
- for N := Lines[0].Line[C].HighNote downto AktNuta+1 do begin
+ for N := Lines[0].Line[C].HighNote downto CurrentNote+1 do begin
Lines[0].Line[C].Note[N] := Lines[0].Line[C].Note[N-1];
end;
// me slightly modify new note
- 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].Lenght);
- Lines[0].Line[C].Note[AktNuta+1].Text := '- ';
- Lines[0].Line[C].Note[AktNuta+1].Color := 0;
+ Lines[0].Line[C].Note[CurrentNote].Lenght := 1;
+ Inc(Lines[0].Line[C].Note[CurrentNote+1].Start);
+ Dec(Lines[0].Line[C].Note[CurrentNote+1].Lenght);
+ Lines[0].Line[C].Note[CurrentNote+1].Text := '- ';
+ Lines[0].Line[C].Note[CurrentNote+1].Color := 0;
end;
procedure TScreenEditSub.DeleteNote;
@@ -920,7 +920,7 @@ begin
begin
// we copy all notes from the next to the selected one
- for N := AktNuta+1 to Lines[0].Line[C].HighNote do begin
+ for N := CurrentNote+1 to Lines[0].Line[C].HighNote do begin
Lines[0].Line[C].Note[N-1] := Lines[0].Line[C].Note[N];
end;
@@ -934,8 +934,8 @@ begin
// me slightly modify new note
- if AktNuta > Lines[0].Line[C].HighNote then Dec(AktNuta);
- Lines[0].Line[C].Note[AktNuta].Color := 1;
+ if CurrentNote > Lines[0].Line[C].HighNote then Dec(CurrentNote);
+ Lines[0].Line[C].Note[CurrentNote].Color := 1;
end
//Last Note of current Sentence Deleted - > Delete Sentence
else
@@ -947,22 +947,22 @@ begin
//Delete Last Sentence
SetLength(Lines[0].Line, Lines[0].High);
Lines[0].High := High(Lines[0].Line);
- Lines[0].Ilosc := Length(Lines[0].Line);
+ Lines[0].Number := Length(Lines[0].Line);
- AktNuta := 0;
+ CurrentNote := 0;
if (C > 0) then
Lines[0].Current := C - 1
else
Lines[0].Current := 0;
- Lines[0].Line[Lines[0].Current].Note[AktNuta].Color := 1;
+ Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
end;
end;
end;
procedure TScreenEditSub.TransposeNote(Transpose: integer);
begin
- Inc(Lines[0].Line[Lines[0].Current].Note[AktNuta].Tone, Transpose);
+ Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Tone, Transpose);
end;
procedure TScreenEditSub.ChangeWholeTone(Tone: integer);
@@ -985,7 +985,7 @@ var
begin
for C := Lines[0].Current to Lines[0].High do begin
NStart := 0;
- if C = Lines[0].Current then NStart := AktNuta;
+ if C = Lines[0].Current then NStart := CurrentNote;
for N := NStart to Lines[0].Line[C].HighNote do begin
Inc(Lines[0].Line[C].Note[N].Start, Move); // move note start
@@ -1022,10 +1022,10 @@ begin
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
+ for N := NHigh - 1 downto CurrentNote + 1 do begin
Lines[0].Line[C].Note[N].Text := Lines[0].Line[C].Note[N-1].Text;
end; // for
- Lines[0].Line[C].Note[AktNuta].Text := '- ';
+ Lines[0].Line[C].Note[CurrentNote].Text := '- ';
end;
procedure TScreenEditSub.MarkSrc;
@@ -1076,7 +1076,7 @@ begin
// create place for new sentences
- SetLength(Lines[0].Line, Lines[0].Ilosc + Num - 1);
+ SetLength(Lines[0].Line, Lines[0].Number + Num - 1);
// moves sentences next to the destination
for C := Lines[0].High downto Dst + 1 do begin
@@ -1097,7 +1097,7 @@ begin
end;
// increase counters
- Lines[0].Ilosc := Lines[0].Ilosc + Num - 1;
+ Lines[0].Number := Lines[0].Number + Num - 1;
Lines[0].High := Lines[0].High + Num - 1;
for C := 0 to Num-1 do
@@ -1191,7 +1191,7 @@ begin
Text[TextMp3].Text := CurrentSong.Mp3;
Lines[0].Current := 0;
- AktNuta := 0;
+ CurrentNote := 0;
Lines[0].Line[0].Note[0].Color := 1;
AudioPlayback.Open(CurrentSong.Path + CurrentSong.Mp3);
@@ -1291,8 +1291,8 @@ begin
end; // if PlaySentence
- Text[TextSentence].Text := IntToStr(Lines[0].Current + 1) + ' / ' + IntToStr(Lines[0].Ilosc);
- Text[TextNote].Text := IntToStr(AktNuta + 1) + ' / ' + IntToStr(Lines[0].Line[Lines[0].Current].IlNut);
+ Text[TextSentence].Text := IntToStr(Lines[0].Current + 1) + ' / ' + IntToStr(Lines[0].Number);
+ Text[TextNote].Text := IntToStr(CurrentNote + 1) + ' / ' + IntToStr(Lines[0].Line[Lines[0].Current].IlNut);
// Song info
Text[TextBPM].Text := FloatToStr(CurrentSong.BPM[0].BPM / 4);
@@ -1302,10 +1302,10 @@ begin
if not Error then
begin
// Note info
- Text[TextNStart].Text := IntToStr(Lines[0].Line[Lines[0].Current].Note[AktNuta].Start);
- Text[TextNDlugosc].Text := IntToStr(Lines[0].Line[Lines[0].Current].Note[AktNuta].Lenght);
- Text[TextNTon].Text := IntToStr(Lines[0].Line[Lines[0].Current].Note[AktNuta].Tone) + ' ( ' + GetNoteName(Lines[0].Line[Lines[0].Current].Note[AktNuta].Tone) + ' )';
- Text[TextNText].Text := Lines[0].Line[Lines[0].Current].Note[AktNuta].Text;
+ Text[TextNStart].Text := IntToStr(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
+ Text[TextNDlugosc].Text := IntToStr(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+ Text[TextNTon].Text := IntToStr(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Tone) + ' ( ' + GetNoteName(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Tone) + ' )';
+ Text[TextNText].Text := Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text;
end;
// Text Edit Mode
diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index 4379dae6..0526b76c 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -131,37 +131,37 @@ function ToSentences(Const Lines: TLines): TSentences;
var
I, J: Integer;
begin
- Result.Akt := Lines.Current;
- Result.High := Lines.High;
- Result.Ilosc := Lines.Ilosc;
- Result.Resolution := Lines.Resolution;
- Result.NotesGAP := Lines.NotesGAP;
+ Result.Current := Lines.Current;
+ Result.High := Lines.High;
+ Result.Number := Lines.Number;
+ Result.Resolution := Lines.Resolution;
+ Result.NotesGAP := Lines.NotesGAP;
Result.TotalLength := Lines.NoteType;
SetLength(Result.Sentence, Length(Lines.Line));
for I := low(Result.Sentence) to high(Result.Sentence) do
begin
- Result.Sentence[I].Start := Lines.Line[I].Start;
- Result.Sentence[I].StartNote := Lines.Line[I].StartNote;
- Result.Sentence[I].Lyric := Lines.Line[I].Lyric;
+ Result.Sentence[I].Start := Lines.Line[I].Start;
+ 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].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;
+ Result.Sentence[I].End_ := 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;
Result.Sentence[I].TotalNotes := Lines.Line[I].TotalNotes;
SetLength(Result.Sentence[I].Note, Length(Lines.Line[I].Note));
for J := low(Result.Sentence[I].Note) to high(Result.Sentence[I].Note) do
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].Lenght;
- Result.Sentence[I].Note[J].Ton := Lines.Line[I].Note[J].Tone;
- Result.Sentence[I].Note[J].TonGamy := Lines.Line[I].Note[J].ToneGamus;
- //Result.Sentence[I].Note[J].Text := Lines.Line[I].Note[J].Tekst;
+ 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].Lenght;
+ Result.Sentence[I].Note[J].Tone := Lines.Line[I].Note[J].Tone;
+ Result.Sentence[I].Note[J].ToneGamus := Lines.Line[I].Note[J].ToneGamus;
+ //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].NoteType;
+ Result.Sentence[I].Note[J].Typ := Lines.Line[I].Note[J].NoteType;
end;
end;
end;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 22:15:43 +0000