diff options
Diffstat (limited to 'Game/Code')
| -rw-r--r-- | Game/Code/Screens/UScreenEditSub.pas | 19 | ||||
| -rw-r--r-- | Game/Code/UltraStar.bdsproj | 4 | ||||
| -rw-r--r-- | Game/Code/UltraStar.dpr | 2 |
3 files changed, 15 insertions, 10 deletions
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas index 6deb4b00..5c2e121a 100644 --- a/Game/Code/Screens/UScreenEditSub.pas +++ b/Game/Code/Screens/UScreenEditSub.pas @@ -1226,7 +1226,8 @@ begin Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[AktNuta[CP]].Freestyle := True;
end;
end; // case
-
+ EditorLyric[CP].AddCzesc(CP, Czesci[CP].Akt);
+ EditorLyric[CP].Selected := AktNuta[CP];
end;
//MP3-Volume Up
@@ -1672,7 +1673,12 @@ begin end; // case
Czesci[P].Czesc[C].Start := S;
+ Czesci[P].Czesc[C-1].Koniec := Min;
end; // for
+ C := Length(Czesci[P].Czesc) - 1;
+ len := Length(Czesci[P].Czesc[C].Nuta);
+ Max := Czesci[P].Czesc[C].Nuta[len-1].Start + Czesci[P].Czesc[C].Nuta[len-1].Dlugosc;
+ Czesci[P].Czesc[C].Koniec := Max;
end;
{
//second run for duet mode:
@@ -1924,12 +1930,10 @@ begin Dec(Czesci[CP].Czesc[C].HighNut);
Dec(Czesci[CP].Czesc[C].IlNut);
-
// me slightly modify new note
if AktNuta[CP] > Czesci[CP].Czesc[C].HighNut then
Dec(AktNuta[CP]);
- Czesci[CP].Czesc[C].Nuta[AktNuta[CP]].Color := 2;
end
//Last Note of current Sentence Deleted - > Delete Sentence
else
@@ -1937,9 +1941,11 @@ begin DeleteSentence;
end;
end;
+
+ Refresh;
EditorLyric[CP].AddCzesc(CP, Czesci[CP].Akt);
- {if AktSong.isDuet then
- EditorLyric[(CP+1) mod 2].AddCzesc((CP+1) mod 2, Czesci[(CP+1) mod 2].Akt);}
+ Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[AktNuta[CP]].Color := 2;
+ EditorLyric[CP].Selected := AktNuta[CP];
end;
procedure TScreenEditSub.DeleteSentence;
@@ -2416,13 +2422,14 @@ var begin
FixTimings;
+ LyricsCorrectSpaces;
for P := 0 to Length(Czesci) - 1 do
begin
Czesci[P].Ilosc := Length(Czesci[P].Czesc);
Czesci[P].High := Czesci[P].Ilosc-1;
Czesci[P].Wartosc := 0;
- for L := 0 to Czesci[P].High - 1 do
+ for L := 0 to Czesci[P].High do
begin
with Czesci[P].Czesc[L] do
begin
diff --git a/Game/Code/UltraStar.bdsproj b/Game/Code/UltraStar.bdsproj index 2f94b78a..36df4a05 100644 --- a/Game/Code/UltraStar.bdsproj +++ b/Game/Code/UltraStar.bdsproj @@ -170,9 +170,7 @@ <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
<VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
-
- <Excluded_Packages>
+ </VersionInfoKeys> <Excluded_Packages>
<Excluded_Packages Name="c:\program files\borland\bds\4.0\Bin\dclib100.bpl">Borland InterBase Express Components</Excluded_Packages>
<Excluded_Packages Name="c:\program files\borland\bds\4.0\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
<Excluded_Packages Name="c:\program files\borland\bds\4.0\Bin\dclIndyCore100.bpl">Indy 10 Core Design Time</Excluded_Packages>
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index b1bdf2d8..f60ee8af 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -122,7 +122,7 @@ uses UVideo in 'Classes\UVideo.pas';
const
- Version = 'UltraStar Deluxe Challenge, Medley & Duet Edition r9 RC4.2';
+ Version = 'UltraStar Deluxe Challenge, Medley & Duet Edition r9 RC5';
var
WndTitle: string;
|