diff options
| -rw-r--r-- | src/base/UIni.pas | 4 | ||||
| -rw-r--r-- | src/screens/UScreenLevel.pas | 10 | ||||
| -rw-r--r-- | src/screens/UScreenMain.pas | 9 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/base/UIni.pas b/src/base/UIni.pas index 284389c2..998d19fb 100644 --- a/src/base/UIni.pas +++ b/src/base/UIni.pas @@ -244,6 +244,10 @@ const IScreenFade: array[0..1] of UTF8String = ('Off', 'On'); IAskbeforeDel: array[0..1] of UTF8String = ('Off', 'On'); IOnSongClick: array[0..2] of UTF8String = ('Sing', 'Select Players', 'Open Menu'); + sStartSing = 0; + sSelectPlayer = 1; + sOpenMenu = 2; + ILineBonus: array[0..1] of UTF8String = ('Off', 'On'); IPartyPopup: array[0..1] of UTF8String = ('Off', 'On'); diff --git a/src/screens/UScreenLevel.pas b/src/screens/UScreenLevel.pas index 4d7d8b5e..1ead9773 100644 --- a/src/screens/UScreenLevel.pas +++ b/src/screens/UScreenLevel.pas @@ -74,14 +74,18 @@ begin Exit; end; end; - + // check special keys case PressedKey of SDLK_ESCAPE, SDLK_BACKSPACE : begin AudioPlayback.PlaySound(SoundLib.Back); - FadeTo(@ScreenName); + + if Ini.OnSongClick = sSelectPlayer then + FadeTo(@ScreenMain) + else + FadeTo(@ScreenName); end; SDLK_RETURN: @@ -106,8 +110,6 @@ begin end; constructor TScreenLevel.Create; -//var -// I: integer; // Auto Removed, Unused Variable begin inherited Create; diff --git a/src/screens/UScreenMain.pas b/src/screens/UScreenMain.pas index 7237eb80..ca4ba7cc 100644 --- a/src/screens/UScreenMain.pas +++ b/src/screens/UScreenMain.pas @@ -136,8 +136,13 @@ begin if (Ini.Players = 4) then PlayersPlay := 6; - ScreenName.Goto_SingScreen := false; - FadeTo(@ScreenName, SoundLib.Start); + if Ini.OnSongClick = sSelectPlayer then + FadeTo(@ScreenLevel) + else + begin + ScreenName.Goto_SingScreen := false; + FadeTo(@ScreenName, SoundLib.Start); + end; end else //show error message ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_SONGS')); |