some optimizations for challenge mode

This commit is contained in:
Alexander Eckart committed 2012-12-17 20:51:32 +01:00
1 parent 188a9b9332
commit 9069553330
2 files changed
+15 -8

No files matched your search

+3 -1
View File
@@ -305,7 +305,9 @@ namespace Vocaluxe.PartyModes
if (TeamNr >= _ScreenSongOptions.Selection.NumJokers.Length) if (TeamNr >= _ScreenSongOptions.Selection.NumJokers.Length)
return; return;
_ScreenSongOptions.Selection.NumJokers[TeamNr]--; if (_ScreenSongOptions.Selection.RandomOnly)
_ScreenSongOptions.Selection.NumJokers[TeamNr]--;
_ScreenSongOptions.Selection.RandomOnly = true; _ScreenSongOptions.Selection.RandomOnly = true;
_ScreenSongOptions.Selection.CategoryChangeAllowed = false; _ScreenSongOptions.Selection.CategoryChangeAllowed = false;
@@ -130,8 +130,8 @@ namespace Vocaluxe.PartyModes
if (Buttons[htButtons(ButtonNext)].Selected) if (Buttons[htButtons(ButtonNext)].Selected)
Next(); Next();
OnAdd(); if (!OnAdd())
OnRemove(); OnRemove();
break; break;
case Keys.Delete: case Keys.Delete:
@@ -237,12 +237,13 @@ namespace Vocaluxe.PartyModes
if (Buttons[htButtons(ButtonNext)].Selected) if (Buttons[htButtons(ButtonNext)].Selected)
Next(); Next();
OnAdd(); if (!OnAdd())
OnRemove();
} }
if (MouseEvent.RB && IsMouseOver(MouseEvent)) if (MouseEvent.RB)
{ {
OnRemove(); Back();
} }
return true; return true;
@@ -452,7 +453,7 @@ namespace Vocaluxe.PartyModes
Buttons[htButtons(ButtonNext)].Visible = false; Buttons[htButtons(ButtonNext)].Visible = false;
} }
private void OnAdd() private bool OnAdd()
{ {
for (int i = 0; i < PlayerChooseButtons.Count; i++) for (int i = 0; i < PlayerChooseButtons.Count; i++)
{ {
@@ -473,12 +474,14 @@ namespace Vocaluxe.PartyModes
//Update Tiles-List //Update Tiles-List
UpdateButtonPlayerChoose(); UpdateButtonPlayerChoose();
CheckInteraction(); CheckInteraction();
return true;
} }
} }
} }
return false;
} }
private void OnRemove() private bool OnRemove()
{ {
for (int i = 0; i < PlayerDestinationButtons.Count; i++) for (int i = 0; i < PlayerDestinationButtons.Count; i++)
{ {
@@ -491,9 +494,11 @@ namespace Vocaluxe.PartyModes
UpdateButtonPlayerDestination(); UpdateButtonPlayerDestination();
UpdateButtonPlayerChoose(); UpdateButtonPlayerChoose();
CheckInteraction(); CheckInteraction();
return true;
} }
} }
} }
return false;
} }
private void Back() private void Back()