From 7e9f7605c6ec6cea06c50d3a2966911632b025fd Mon Sep 17 00:00:00 2001
From: Alexander Eckart <brunzel@gmx.li>
Date: Mon, 17 Dec 2012 22:07:26 +0100
Subject: [PATCH] some additions

---
 PartyModeChallenge/PartyModeChallenge.cs |  5 +++++
 Vocaluxe/Base/CParty.cs                  |  5 +++++
 Vocaluxe/Screens/CScreenSing.cs          | 11 ++++++++---
 VocaluxeLib/PartyModes/CPartyMode.cs     | 15 +++++++++++++++
 VocaluxeLib/PartyModes/CPartyModeNone.cs |  1 -
 VocaluxeLib/PartyModes/IPartyMode.cs     |  3 +++
 6 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModeChallenge/PartyModeChallenge.cs
index f93b3898..56dc43e4 100644
--- a/PartyModeChallenge/PartyModeChallenge.cs
+++ b/PartyModeChallenge/PartyModeChallenge.cs
@@ -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;
diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs
index 4d80b57f..e88dec81 100644
--- a/Vocaluxe/Base/CParty.cs
+++ b/Vocaluxe/Base/CParty.cs
@@ -176,6 +176,11 @@ namespace Vocaluxe.Base
         {
             _CurrentPartyMode.PartyMode.SongSelected(SongID);
         }
+
+        public static void FinishedSinging()
+        {
+            _CurrentPartyMode.PartyMode.FinishedSinging();
+        }
         #endregion Interface
 
         #region private stuff
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index fdbd045e..43b21689 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -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();
         }
diff --git a/VocaluxeLib/PartyModes/CPartyMode.cs b/VocaluxeLib/PartyModes/CPartyMode.cs
index feacf6f4..d406054a 100644
--- a/VocaluxeLib/PartyModes/CPartyMode.cs
+++ b/VocaluxeLib/PartyModes/CPartyMode.cs
@@ -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
     }
 }
diff --git a/VocaluxeLib/PartyModes/CPartyModeNone.cs b/VocaluxeLib/PartyModes/CPartyModeNone.cs
index 3a9ca0dc..e78a06c9 100644
--- a/VocaluxeLib/PartyModes/CPartyModeNone.cs
+++ b/VocaluxeLib/PartyModes/CPartyModeNone.cs
@@ -35,6 +35,5 @@ namespace Vocaluxe.PartyModes
             _ScreenSongOptions.Sorting.SearchString = SearchString;
             _ScreenSongOptions.Sorting.SearchStringVisible = Visible;
         }
-
     }
 }
diff --git a/VocaluxeLib/PartyModes/IPartyMode.cs b/VocaluxeLib/PartyModes/IPartyMode.cs
index d06cdf81..524271f9 100644
--- a/VocaluxeLib/PartyModes/IPartyMode.cs
+++ b/VocaluxeLib/PartyModes/IPartyMode.cs
@@ -78,5 +78,8 @@ namespace Vocaluxe.PartyModes
 
         void JokerUsed(int TeamNr);
         void SongSelected(int SongID);
+        void FinishedSinging();
+        void LeavingScore();
+        void LeavingHighscore();
     }
 }