diff options
Diffstat (limited to 'Game/Code/Screens')
| -rw-r--r-- | Game/Code/Screens/UScreenPartyScore.pas | 1 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSing.pas | 6 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSong.pas | 13 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSongJumpto.pas | 31 |
4 files changed, 30 insertions, 21 deletions
diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas index 01a4349e..d7acb33c 100644 --- a/Game/Code/Screens/UScreenPartyScore.pas +++ b/Game/Code/Screens/UScreenPartyScore.pas @@ -117,7 +117,6 @@ begin FadeTo(@ScreenPartyNewRound)
else
begin
- PartySession.EndRound;
FadeTo(@ScreenPartyWin);
end;
Fadeout := true;
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index 70da386b..c15b0f85 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -221,9 +221,9 @@ begin SDLK_N:
begin
- if (ScreenSong.Mode <> smNormal) then
+ if (ScreenSong.Mode <> smNormal) and (ScreenSong.Mode <> smMedley)then
Exit;
-
+
Inc(ShowNotes);
if (ShowNotes>4) then
ShowNotes:=0;
@@ -283,7 +283,7 @@ begin SDLK_S:
begin
- if (ScreenSong.Mode = smNormal) then
+ if (ScreenSong.Mode = smNormal) or (ScreenSong.Mode = smMedley) then
Ini.PossibleScore := (Ini.PossibleScore+1) mod 4;
//Ini.Save;
end;
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index 9cc87a41..157eed41 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -515,6 +515,19 @@ begin else
Music.EnableVocalRemover;
end;
+
+ SDLK_O:
+ begin
+ if (Mode = smNormal) then
+ begin
+ Music.Stop;
+ Music.PlayBack;
+ acClose;
+
+ FadeTo(@ScreenOptions);
+ FadeOut := true;
+ end;
+ end;
SDLK_A:
begin
diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas index b210dd7e..4c84f67c 100644 --- a/Game/Code/Screens/UScreenSongJumpto.pas +++ b/Game/Code/Screens/UScreenSongJumpto.pas @@ -47,26 +47,23 @@ uses UGraphic, UHelp, UMain, UIni, UTexture, ULanguage, UParty, USongs, UScreenS function TScreenSongJumpto.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
begin
Result := true;
+
+ if not (ScanCode in [0..31, 127..159]) then
+ begin
+ if not isDuet then
+ begin
+ if Interaction = 0 then
+ begin
+ Button[0].Text[0].Text := Button[0].Text[0].Text + chr(ScanCode);
+ SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, SelectType));
+ end;
+ end;
+ Exit;
+ end;
+
If (PressedDown) Then
begin // Key Down
case PressedKey of
- 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,
- SDLK_LEFTBRACKET, SDLK_SEMICOLON,
- SDLK_PERIOD:
- begin
- if not isDuet then
- begin
- if Interaction = 0 then
- begin
- Button[0].Text[0].Text := Button[0].Text[0].Text + chr(ScanCode);
- SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, SelectType));
- end;
- end;
- end;
-
//MP3-Volume Up
SDLK_PAGEUP:
begin
|