Merge remote-tracking branch 'remotes/flokuep/develop' into develop

This commit is contained in:
Alexander Eckart committed 2012-12-23 16:23:23 +01:00
commit ffd413165d
3 files changed
+30 -15

No files matched your search

@@ -33,11 +33,11 @@
<!--<Skin>: Texture name--> <!--<Skin>: Texture name-->
<Skin>PopupBG</Skin> <Skin>PopupBG</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height--> <!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
<X>449</X> <X>0</X>
<Y>261</Y> <Y>0</Y>
<Z>-1,00</Z> <Z>-1,00</Z>
<W>382</W> <W>1280</W>
<H>198</H> <H>720</H>
<!--<Color>: Static color from ColorScheme (high priority)--> <!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)--> <!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color> <Color>StaticColor</Color>
@@ -126,7 +126,7 @@
<!--<Z>: Text position--> <!--<Z>: Text position-->
<Z>0,00</Z> <Z>0,00</Z>
<!--<H>: Text height--> <!--<H>: Text height-->
<H>37</H> <H>32</H>
<!--<MaxW>: Maximum text width (if exists)--> <!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)--> <!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)--> <!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -155,8 +155,9 @@
<!--<Z>: Text position--> <!--<Z>: Text position-->
<Z>0,00</Z> <Z>0,00</Z>
<!--<H>: Text height--> <!--<H>: Text height-->
<H>37</H> <H>32</H>
<!--<MaxW>: Maximum text width (if exists)--> <!--<MaxW>: Maximum text width (if exists)-->
<MaxW>130</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)--> <!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)--> <!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color> <Color>StaticColor</Color>
@@ -179,12 +180,12 @@
</TextPlayerName> </TextPlayerName>
<TextNumPlayed> <TextNumPlayed>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>400</X> <X>320</X>
<Y>100</Y> <Y>100</Y>
<!--<Z>: Text position--> <!--<Z>: Text position-->
<Z>0,00</Z> <Z>0,00</Z>
<!--<H>: Text height--> <!--<H>: Text height-->
<H>37</H> <H>32</H>
<!--<MaxW>: Maximum text width (if exists)--> <!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)--> <!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)--> <!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -208,12 +209,12 @@
</TextNumPlayed> </TextNumPlayed>
<TextWon> <TextWon>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>500</X> <X>400</X>
<Y>100</Y> <Y>100</Y>
<!--<Z>: Text position--> <!--<Z>: Text position-->
<Z>0,00</Z> <Z>0,00</Z>
<!--<H>: Text height--> <!--<H>: Text height-->
<H>37</H> <H>32</H>
<!--<MaxW>: Maximum text width (if exists)--> <!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)--> <!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)--> <!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -237,12 +238,12 @@
</TextWon> </TextWon>
<TextSingPoints> <TextSingPoints>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>750</X> <X>550</X>
<Y>100</Y> <Y>100</Y>
<!--<Z>: Text position--> <!--<Z>: Text position-->
<Z>0,00</Z> <Z>0,00</Z>
<!--<H>: Text height--> <!--<H>: Text height-->
<H>37</H> <H>32</H>
<!--<MaxW>: Maximum text width (if exists)--> <!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)--> <!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)--> <!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -266,12 +267,12 @@
</TextSingPoints> </TextSingPoints>
<TextGamePoints> <TextGamePoints>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>850</X> <X>650</X>
<Y>100</Y> <Y>100</Y>
<!--<Z>: Text position--> <!--<Z>: Text position-->
<Z>0,00</Z> <Z>0,00</Z>
<!--<H>: Text height--> <!--<H>: Text height-->
<H>37</H> <H>32</H>
<!--<MaxW>: Maximum text width (if exists)--> <!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)--> <!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)--> <!--or <R>, <G>, <B>, <A> (lower priority)-->
Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

+15 -1
View File
@@ -205,6 +205,8 @@ namespace Vocaluxe.PartyModes
Buttons[htButtons(ButtonExit)].Visible = true; Buttons[htButtons(ButtonExit)].Visible = true;
} }
SetInteractionToButton(Buttons[htButtons(ButtonNextRound)]);
ShowPopup(false); ShowPopup(false);
} }
@@ -245,6 +247,7 @@ namespace Vocaluxe.PartyModes
Buttons[htButtons(ButtonPopupYes)].Visible = ExitPopupVisible; Buttons[htButtons(ButtonPopupYes)].Visible = ExitPopupVisible;
Buttons[htButtons(ButtonPopupNo)].Visible = ExitPopupVisible; Buttons[htButtons(ButtonPopupNo)].Visible = ExitPopupVisible;
if (ExitPopupVisible)
SetInteractionToButton(Buttons[htButtons(ButtonPopupNo)]); SetInteractionToButton(Buttons[htButtons(ButtonPopupNo)]);
} }
@@ -281,6 +284,8 @@ namespace Vocaluxe.PartyModes
} }
private void UpdateNextPlayerContents() private void UpdateNextPlayerContents()
{
if (GameState.CurrentRoundNr <= GameState.Combs.Count)
{ {
SProfile[] profiles = _Base.Profiles.GetProfiles(); SProfile[] profiles = _Base.Profiles.GetProfiles();
for (int i = 0; i < GameState.NumPlayerAtOnce; i++) for (int i = 0; i < GameState.NumPlayerAtOnce; i++)
@@ -291,6 +296,15 @@ namespace Vocaluxe.PartyModes
NextPlayerTexts[i].Color = _Base.Theme.GetPlayerColor((i + 1)); NextPlayerTexts[i].Color = _Base.Theme.GetPlayerColor((i + 1));
} }
} }
else
{
for (int i = 0; i < GameState.NumPlayerAtOnce; i++)
{
NextPlayerStatics[i].Visible = false;
NextPlayerTexts[i].Visible = false;
}
}
}
private void BuildTable() private void BuildTable()
{ {
@@ -315,7 +329,7 @@ namespace Vocaluxe.PartyModes
row.SingPoints.Y += delta * (i + 1); row.SingPoints.Y += delta * (i + 1);
row.GamePoints.Y += delta * (i + 1); row.GamePoints.Y += delta * (i + 1);
row.Pos.Text = (i + 1).ToString() + ")"; row.Pos.Text = (i + 1).ToString() + ".";
row.Pos.Visible = false; row.Pos.Visible = false;
row.Name.Visible = false; row.Name.Visible = false;