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

Merge branch 'develop' of https://github.com/flokuep/Vocaluxe into develop

Browse Source
This commit is contained in:
Stephan Sundermann committed 2013-12-22 17:36:45 +01:00
2 parents d26fad858d 9fb9d70dc9
commit 7009096b1c
5 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Profiles/guest1.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<PlayerName>Guest 1</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<Avatar>Avatar_f.png</Avatar>
<GuestProfile>TR_CONFIG_ON</GuestProfile>
<UserRole>TR_USERROLE_GUEST</UserRole>
<Active>TR_CONFIG_ON</Active>
</Info>
</root>
Output/Profiles/guest2.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<PlayerName>Guest 2</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<Avatar>Avatar_f.png</Avatar>
<GuestProfile>TR_CONFIG_ON</GuestProfile>
<UserRole>TR_USERROLE_GUEST</UserRole>
<Active>TR_CONFIG_ON</Active>
</Info>
</root>
Output/Profiles/guest3.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<PlayerName>Guest 3</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<Avatar>Avatar_m.png</Avatar>
<GuestProfile>TR_CONFIG_ON</GuestProfile>
<UserRole>TR_USERROLE_NORMAL</UserRole>
<Active>TR_CONFIG_ON</Active>
</Info>
</root>
Vocaluxe/Screens/CScreenSing.cs
+1 -1
View File
@@ -877,7 +877,7 @@ namespace Vocaluxe.Screens
}
else
{
CGame.ResetToLastLine(_CurrentStream, _CurrentVideo);
//CGame.ResetToLastLine(_CurrentStream, _CurrentVideo);
_Buttons[_ButtonCancel].Visible = false;
_Buttons[_ButtonContinue].Visible = false;
_Buttons[_ButtonSkip].Visible = false;
VocaluxeLib/Menu/CNameSelection.cs
+1 -1
View File
@@ -509,7 +509,7 @@ namespace VocaluxeLib.Menu
{
//Don't show profile if is selected, but if selected and guest
if (CBase.Game.GetPlayers()[p].ProfileID == profile.ID
&& !profile.UserRole.HasFlag(EUserRole.TR_USERROLE_NORMAL))
&& profile.UserRole >= EUserRole.TR_USERROLE_NORMAL)
visible = false;
}
}