aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Game/Code/Screens/UScreenEditHeader.pas2
-rw-r--r--Game/Code/Screens/UScreenName.pas3
-rw-r--r--Game/Code/Screens/UScreenOpen.pas6
-rw-r--r--Game/Code/Screens/UScreenPartyPlayer.pas3
-rw-r--r--Game/Code/Screens/UScreenSing.pas12
-rw-r--r--Game/Code/Screens/UScreenSongJumpto.pas9
6 files changed, 20 insertions, 15 deletions
diff --git a/Game/Code/Screens/UScreenEditHeader.pas b/Game/Code/Screens/UScreenEditHeader.pas
index 65f39e44..a601555a 100644
--- a/Game/Code/Screens/UScreenEditHeader.pas
+++ b/Game/Code/Screens/UScreenEditHeader.pas
@@ -105,7 +105,7 @@ begin
begin
T := Interaction - 2 + TextTitle;
if (Interaction >= 2) and (Interaction <= 13) and (Length(Text[T].Text) >= 1) then begin
- Delete(Text[T].Text, Length(Text[T].Text), 1);
+ Text[T].DeleteLastL;
SetRoundButtons;
end;
end;
diff --git a/Game/Code/Screens/UScreenName.pas b/Game/Code/Screens/UScreenName.pas
index 99f5d40a..82519e87 100644
--- a/Game/Code/Screens/UScreenName.pas
+++ b/Game/Code/Screens/UScreenName.pas
@@ -33,8 +33,7 @@ begin
SDLK_BACKSPACE:
begin
- Delete(Button[Interaction].Text[0].Text,
- Length(Button[Interaction].Text[0].Text), 1);
+ Button[Interaction].Text[0].DeleteLastL;
end;
SDLK_ESCAPE :
diff --git a/Game/Code/Screens/UScreenOpen.pas b/Game/Code/Screens/UScreenOpen.pas
index 723f299f..264f57a9 100644
--- a/Game/Code/Screens/UScreenOpen.pas
+++ b/Game/Code/Screens/UScreenOpen.pas
@@ -43,9 +43,9 @@ begin
case PressedKey of
8: // del
begin
- if Interaction = 0 then
- if Length(Text[TextN].Text) >= 1 then begin
- Delete(Text[TextN].Text, Length(Text[TextN].Text), 1);
+ if Interaction = 0 then
+ begin
+ Text[TextN].DeleteLastL;
FileName := Text[TextN].Text;
end;
end;
diff --git a/Game/Code/Screens/UScreenPartyPlayer.pas b/Game/Code/Screens/UScreenPartyPlayer.pas
index b954212a..4fc43013 100644
--- a/Game/Code/Screens/UScreenPartyPlayer.pas
+++ b/Game/Code/Screens/UScreenPartyPlayer.pas
@@ -63,8 +63,7 @@ begin
SDLK_BACKSPACE:
begin
- Delete(Button[Interaction].Text[0].Text,
- Length(Button[Interaction].Text[0].Text), 1);
+ Button[Interaction].Text[0].DeleteLastL;
end;
SDLK_ESCAPE :
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 201b97fa..ee4bedc8 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -369,6 +369,11 @@ begin
//Deactivate Pause
Paused := False;
+ //Kill all Stars not Killed yet
+ //GoldenStarsTwinkle Mod
+ GoldenRec.KillAll;
+ //GoldenStarsTwinkle Mod End
+
{Static[StaticP2R].Visible := V2R;
Static[StaticP2RScoreBG].Visible := V2R;
Text[TextP2R].Visible := V2R;
@@ -1014,11 +1019,6 @@ begin
Music.CaptureStop;
Music.Stop;
- //Kill all Stars not Killed yet
- //GoldenStarsTwinkle Mod
- GoldenRec.KillAll;
- //GoldenStarsTwinkle Mod End
-
if Ini.SavePlayback = 1 then begin
Log.BenchmarkStart(0);
Log.LogVoice(0);
@@ -1032,6 +1032,8 @@ begin
CloseSmpeg;
AktSong.VideoLoaded := false; // to prevent drawing closed video
end;
+
+ SetFontItalic (False);
end;
procedure TScreenSing.UpdateLCD;
diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas
index 2bf0cb5b..0ba61450 100644
--- a/Game/Code/Screens/UScreenSongJumpto.pas
+++ b/Game/Code/Screens/UScreenSongJumpto.pas
@@ -90,8 +90,7 @@ begin
begin
if Interaction = 0 then
begin
- Delete(Button[0].Text[0].Text,
- Length(Button[0].Text[0].Text), 1);
+ Button[0].Text[0].DeleteLastL;
SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, SelectType));
end;
end;
@@ -121,12 +120,18 @@ begin
SDLK_RIGHT:
begin
if (Interaction=1) then
+ begin
InteractInc;
+ SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, SelectType));
+ end;
end;
SDLK_LEFT:
begin
if (Interaction=1) then
+ begin
InteractDec;
+ SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, SelectType));
+ end;
end;
end;
end