some additions

This commit is contained in:
Alexander Eckart committed 2012-12-17 22:07:26 +01:00
1 parent fea7b42fba
commit 7e9f7605c6
6 files changed
+36 -4

No files matched your search

+5
View File
@@ -343,6 +343,11 @@ namespace Vocaluxe.PartyModes
_Base.Graphics.FadeTo(EScreens.ScreenSing); _Base.Graphics.FadeTo(EScreens.ScreenSing);
} }
public override void LeavingHighscore()
{
_Base.Graphics.FadeTo(EScreens.ScreenPartyDummy);
}
private void StartNextRound() private void StartNextRound()
{ {
_ScreenSongOptions.Selection.RandomOnly = false; _ScreenSongOptions.Selection.RandomOnly = false;
+5
View File
@@ -176,6 +176,11 @@ namespace Vocaluxe.Base
{ {
_CurrentPartyMode.PartyMode.SongSelected(SongID); _CurrentPartyMode.PartyMode.SongSelected(SongID);
} }
public static void FinishedSinging()
{
_CurrentPartyMode.PartyMode.FinishedSinging();
}
#endregion Interface #endregion Interface
#region private stuff #region private stuff
+8 -3
View File
@@ -577,8 +577,7 @@ namespace Vocaluxe.Screens
if (CGame.IsFinished()) if (CGame.IsFinished())
{ {
CGraphics.FadeTo(EScreens.ScreenScore); FinishedSinging();
_FadeOut = true;
return; return;
} }
@@ -723,8 +722,14 @@ namespace Vocaluxe.Screens
while(!CGame.IsFinished()) while(!CGame.IsFinished())
CGame.NextRound(); CGame.NextRound();
CGraphics.FadeTo(EScreens.ScreenScore); FinishedSinging();
}
private void FinishedSinging()
{
_FadeOut = true; _FadeOut = true;
CParty.FinishedSinging();
if (_Webcam) if (_Webcam)
CWebcam.Close(); CWebcam.Close();
} }
+15
View File
@@ -111,6 +111,21 @@ namespace Vocaluxe.PartyModes
public virtual void SongSelected(int SongID) public virtual void SongSelected(int SongID)
{ {
} }
public virtual void FinishedSinging()
{
_Base.Graphics.FadeTo(EScreens.ScreenScore);
}
public virtual void LeavingScore()
{
_Base.Graphics.FadeTo(EScreens.ScreenHighscore);
}
public virtual void LeavingHighscore()
{
_Base.Graphics.FadeTo(EScreens.ScreenSong);
}
#endregion Implementation #endregion Implementation
} }
} }
-1
View File
@@ -35,6 +35,5 @@ namespace Vocaluxe.PartyModes
_ScreenSongOptions.Sorting.SearchString = SearchString; _ScreenSongOptions.Sorting.SearchString = SearchString;
_ScreenSongOptions.Sorting.SearchStringVisible = Visible; _ScreenSongOptions.Sorting.SearchStringVisible = Visible;
} }
} }
} }
+3
View File
@@ -78,5 +78,8 @@ namespace Vocaluxe.PartyModes
void JokerUsed(int TeamNr); void JokerUsed(int TeamNr);
void SongSelected(int SongID); void SongSelected(int SongID);
void FinishedSinging();
void LeavingScore();
void LeavingHighscore();
} }
} }