Added key to skip 30 seconds and don't reload notes from pause menu

This commit is contained in:
Stefan authored and GitHub committed 2020-01-18 23:05:47 +01:00
1 parent de684a806d
commit a36ee3e389
1 file changed
+22 -3
+22 -3
View File
@@ -289,6 +289,7 @@ namespace Vocaluxe.Screens
song.Save(); song.Save();
break; break;
// Restart Round and reload song file header
case Keys.R: case Keys.R:
if (keyEvent.Mod == EModifier.Ctrl) if (keyEvent.Mod == EModifier.Ctrl)
{ {
@@ -300,6 +301,7 @@ namespace Vocaluxe.Screens
} }
break; break;
// Restart Round and reload song file header
case Keys.F5: case Keys.F5:
if (_Pause) if (_Pause)
{ {
@@ -307,6 +309,23 @@ namespace Vocaluxe.Screens
_RestartRound(); _RestartRound();
} }
break; break;
// Skip 30 seconds
case Keys.Right:
if (keyEvent.Mod == EModifier.Ctrl)
{
if (!_Pause)
{
if (_TimerSongText.IsRunning)
_TimerSongText.Stop();
float newTime = _CurrentTime + 30f;
if (CSound.GetLength(_CurrentStream) < (_CurrentTime + 30f))
newTime = CSound.GetLength(_CurrentStream) - 1f;
CSound.SetPosition(_CurrentStream, newTime);
}
}
break;
} }
} }
@@ -982,7 +1001,7 @@ namespace Vocaluxe.Screens
_CloseSong(); _CloseSong();
CGame.ResetPlayer(); CGame.ResetPlayer();
_LoadCurrentSong(); _LoadCurrentSong(true);
_StartSong(); _StartSong();
} }
@@ -1062,7 +1081,7 @@ namespace Vocaluxe.Screens
/// <summary> /// <summary>
/// Prepare streams and screen for current song. /// Prepare streams and screen for current song.
/// </summary> /// </summary>
private void _LoadCurrentSong() private void _LoadCurrentSong(bool restartRound = false)
{ {
if (CGame.IsFinished()) if (CGame.IsFinished())
{ {
@@ -1071,7 +1090,7 @@ namespace Vocaluxe.Screens
} }
CSong song = CGame.GetSong(); CSong song = CGame.GetSong();
song.ReloadSong(); song.ReloadSong(!restartRound);
if (song == null) if (song == null)
{ {