Fix missing song length and wrong volumes (int=0-100, float=0-1)

Also fade in preview music
This commit is contained in:
Flamefire committed 2014-11-27 23:06:01 +01:00
1 parent b99f9467de
commit 4a78dd4b31
17 files changed
+65 -73

No files matched your search

@@ -193,7 +193,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
break;
case EStage.Main:
_Stage = EStage.Singing;
_StartNextRound();
if (!_StartNextRound())
CBase.Graphics.FadeTo(EScreen.Party);
break;
case EStage.Singing:
_Stage = EStage.Main;
@@ -335,7 +336,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
Next();
}
private void _StartNextRound()
private bool _StartNextRound()
{
_ScreenSongOptions.Selection.RandomOnly = _ScreenSongOptions.Sorting.Tabs != EOffOn.TR_CONFIG_ON;
_ScreenSongOptions.Selection.CategoryChangeAllowed = _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_ON;
@@ -343,8 +344,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
_SetTeamNames();
GameData.CatSongIndices = null;
if (_RandomizeSongs())
CBase.Graphics.FadeTo(EScreen.Sing);
return _RandomizeSongs();
}
private bool _RandomizeSongs()
@@ -383,7 +383,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
if (visibleSongs.Count == 0)
{
CBase.Log.LogError("CPartyChallengeMedleyMode Error: There are no songs!");
CBase.Graphics.FadeTo(EScreen.Party);
return false;
}
@@ -407,7 +406,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
if (ids.Count == 0)
{
CBase.Log.LogError("CPartyChallengeMedleyMode Error: There are no medley songs!");
CBase.Graphics.FadeTo(EScreen.Party);
return false;
}