Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Right number of drop-areas OnShow...

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-03-31 10:59:53 +02:00
1 parent 86cfdab4ad
commit ea6471ad80
1 file changed
+16 -21
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Screens/CScreenNames.cs
+16 -21
View File
@@ -124,7 +124,7 @@ namespace Vocaluxe.Screens
} }
if (!processed) if (!processed)
UpdateSelection(); UpdatePlayerNumber();
} }
return true; return true;
@@ -225,8 +225,7 @@ namespace Vocaluxe.Screens
} }
if (!processed) if (!processed)
UpdateSelection(); UpdatePlayerNumber();
UpdatePlayerNumber();
} }
if (MouseEvent.RB) if (MouseEvent.RB)
@@ -249,7 +248,7 @@ namespace Vocaluxe.Screens
NameSelections[htNameSelections(NameSelection)].Init(); NameSelections[htNameSelections(NameSelection)].Init();
UpdateSlides(); UpdateSlides();
UpdateVisibility(); UpdatePlayerNumber();
CheckMics(); CheckMics();
} }
@@ -308,27 +307,23 @@ namespace Vocaluxe.Screens
private void UpdatePlayerNumber() private void UpdatePlayerNumber()
{ {
if (CConfig.NumPlayer != (int)SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection + 1) CConfig.NumPlayer = (int)SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection + 1;
CGame.NumPlayer = (int)SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection + 1;
for (int i = 1; i <= CSettings.MaxNumPlayer; i++)
{ {
CConfig.NumPlayer = (int)SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection + 1; if (i <= CGame.NumPlayer)
CGame.NumPlayer = (int)SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection + 1;
for (int i = 1; i <= CSettings.MaxNumPlayer; i++)
{ {
if (i <= CGame.NumPlayer) Statics[htStatics("StaticPlayer" + i)].Visible = true;
{ Texts[htTexts("TextPlayer" + i)].Visible = true;
Statics[htStatics("StaticPlayer" + i)].Visible = true; }
Texts[htTexts("TextPlayer" + i)].Visible = true; else
} {
else Statics[htStatics("StaticPlayer" + i)].Visible = false;
{ Texts[htTexts("TextPlayer" + i)].Visible = false;
Statics[htStatics("StaticPlayer" + i)].Visible = false;
Texts[htTexts("TextPlayer" + i)].Visible = false;
}
} }
CConfig.SaveConfig();
CheckMics();
} }
CConfig.SaveConfig();
CheckMics();
} }
private void UpdateVisibility() private void UpdateVisibility()