From 331fbb152642a41be536d54f0390cca3893de51e Mon Sep 17 00:00:00 2001
From: Flamefire <alex@grundis.de>
Date: Tue, 30 Apr 2013 19:42:37 +0200
Subject: [PATCH] Revert "Added message for no-mics-error on party-screen."

This reverts commit 3884632772aaa390859814c46669b88ecb640053.
---
 Output/Themes/Ambient/Screens/ScreenParty.xml | 32 +------------------
 Vocaluxe/Screens/CScreenParty.cs              | 19 +++++++----
 2 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml
index c6779b60..86df74ac 100644
--- a/Output/Themes/Ambient/Screens/ScreenParty.xml
+++ b/Output/Themes/Ambient/Screens/ScreenParty.xml
@@ -471,36 +471,6 @@
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
     </TextError>
-    <TextErrorMics>
-      <!--<X>, <Y>: Text position-->
-      <X>850</X>
-      <Y>560</Y>
-      <!--<Z>: Text position-->
-      <Z>0,00</Z>
-      <!--<H>: Text height-->
-      <H>32</H>
-      <!--<MaxW>: Maximum text width (if exists)-->
-      <MaxW>600</MaxW>
-      <!--<Color>: Text color from ColorScheme (high priority)-->
-      <!--or <R>, <G>, <B>, <A> (lower priority)-->
-      <Color>TextWarningColor</Color>
-      <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
-      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
-      <SColor>TextSColor</SColor>
-      <!--<Align>: Text align horizontal: Left, Center, Right-->
-      <Align>Center</Align>
-      <!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
-      <HAlign>Center</HAlign>
-      <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
-      <Style>Bold</Style>
-      <!--<Font>: Text font name-->
-      <Font>Outline</Font>
-      <!--<Text>: Nothing or translation tag-->
-      <Text>TR_SCREENPARTY_ERROR_MICS</Text>
-      <!--<Reflection> If exists:-->
-      <!--   <Space>: Reflection Space-->
-      <!--   <Height>: Reflection Height-->
-    </TextErrorMics>
     <ButtonStart>
       <!--<Skin>: Texture name-->
       <Skin>Button</Skin>
@@ -683,4 +653,4 @@
       <NumVisible>1</NumVisible>
     </SelectSlideModes>
   </ScreenParty>
-</root>
+</root>
\ No newline at end of file
diff --git a/Vocaluxe/Screens/CScreenParty.cs b/Vocaluxe/Screens/CScreenParty.cs
index d81e0fec..f6e37116 100644
--- a/Vocaluxe/Screens/CScreenParty.cs
+++ b/Vocaluxe/Screens/CScreenParty.cs
@@ -39,7 +39,6 @@ namespace Vocaluxe.Screens
         private const string _TextAuthor = "TextAuthor";
         private const string _TextVersion = "TextVersion";
         private const string _TextError = "TextError";
-        private const string _TextErrorMics = "TextErrorMics";
         private const string _ButtonStart = "ButtonStart";
         private const string _ButtonExit = "ButtonExit";
         private const string _SelectSlideModes = "SelectSlideModes";
@@ -50,7 +49,7 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeTexts = new string[] {_TextDescription, _TextTargetAudience, _TextNumTeams, _TextNumPlayers, _TextAuthor, _TextVersion, _TextError, _TextErrorMics};
+            _ThemeTexts = new string[] {_TextDescription, _TextTargetAudience, _TextNumTeams, _TextNumPlayers, _TextAuthor, _TextVersion, _TextError};
             _ThemeButtons = new string[] {_ButtonStart, _ButtonExit};
             _ThemeSelectSlides = new string[] {_SelectSlideModes};
         }
@@ -121,8 +120,6 @@ namespace Vocaluxe.Screens
             _SelectSlides[_SelectSlideModes].Selection = 0;
             _UpdateSelection();
 
-            _Texts[_TextErrorMics].Visible = CConfig.GetMaxNumMics() == 0;
-
             _SetInteractionToSelectSlide(_SelectSlides[_SelectSlideModes]);
         }
 
@@ -177,8 +174,16 @@ namespace Vocaluxe.Screens
             _Texts[_TextVersion].Text = _PartyModeInfos[index].VersionMajor + "." + _PartyModeInfos[index].VersionMinor;
             _Texts[_TextVersion].TranslationID = _PartyModeInfos[index].PartyModeID;
 
-            _Buttons[_ButtonStart].Visible = _PartyModeInfos[index].Playable && CConfig.GetMaxNumMics() > 0;
-            _Texts[_TextError].Visible = !_PartyModeInfos[index].Playable;
+            if (!_PartyModeInfos[index].Playable)
+            {
+                _Buttons[_ButtonStart].Visible = false;
+                _Texts[_TextError].Visible = true;
+            }
+            else
+            {
+                _Buttons[_ButtonStart].Visible = true;
+                _Texts[_TextError].Visible = false;
+            }
         }
 
         private void _StartPartyMode()
@@ -191,7 +196,7 @@ namespace Vocaluxe.Screens
                 return;
 
             if (CConfig.GetMaxNumMics() == 0)
-                return;
+                return; //TODO: Add message!
 
             CParty.SetPartyMode(_PartyModeInfos[index].PartyModeID);
             CGraphics.FadeTo(EScreens.ScreenPartyDummy);