some additions
This commit is contained in:
1 parent
fea7b42fba
commit
7e9f7605c6
6 files changed
+36
-4
No files matched your search
@@ -343,6 +343,11 @@ namespace Vocaluxe.PartyModes
|
||||
_Base.Graphics.FadeTo(EScreens.ScreenSing);
|
||||
}
|
||||
|
||||
public override void LeavingHighscore()
|
||||
{
|
||||
_Base.Graphics.FadeTo(EScreens.ScreenPartyDummy);
|
||||
}
|
||||
|
||||
private void StartNextRound()
|
||||
{
|
||||
_ScreenSongOptions.Selection.RandomOnly = false;
|
||||
|
||||
@@ -176,6 +176,11 @@ namespace Vocaluxe.Base
|
||||
{
|
||||
_CurrentPartyMode.PartyMode.SongSelected(SongID);
|
||||
}
|
||||
|
||||
public static void FinishedSinging()
|
||||
{
|
||||
_CurrentPartyMode.PartyMode.FinishedSinging();
|
||||
}
|
||||
#endregion Interface
|
||||
|
||||
#region private stuff
|
||||
|
||||
@@ -577,8 +577,7 @@ namespace Vocaluxe.Screens
|
||||
|
||||
if (CGame.IsFinished())
|
||||
{
|
||||
CGraphics.FadeTo(EScreens.ScreenScore);
|
||||
_FadeOut = true;
|
||||
FinishedSinging();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -723,8 +722,14 @@ namespace Vocaluxe.Screens
|
||||
while(!CGame.IsFinished())
|
||||
CGame.NextRound();
|
||||
|
||||
CGraphics.FadeTo(EScreens.ScreenScore);
|
||||
FinishedSinging();
|
||||
}
|
||||
|
||||
private void FinishedSinging()
|
||||
{
|
||||
_FadeOut = true;
|
||||
CParty.FinishedSinging();
|
||||
|
||||
if (_Webcam)
|
||||
CWebcam.Close();
|
||||
}
|
||||
|
||||
@@ -111,6 +111,21 @@ namespace Vocaluxe.PartyModes
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -35,6 +35,5 @@ namespace Vocaluxe.PartyModes
|
||||
_ScreenSongOptions.Sorting.SearchString = SearchString;
|
||||
_ScreenSongOptions.Sorting.SearchStringVisible = Visible;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -78,5 +78,8 @@ namespace Vocaluxe.PartyModes
|
||||
|
||||
void JokerUsed(int TeamNr);
|
||||
void SongSelected(int SongID);
|
||||
void FinishedSinging();
|
||||
void LeavingScore();
|
||||
void LeavingHighscore();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user