Fix weird formatting in CScreenSong.cs (no code changes)
This commit is contained in:
1 parent
6945ac1e07
commit
c2462d723a
2 files changed
+9
-13
No files matched your search
+1
-4
@@ -1,6 +1,6 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Express 2012 for Windows Desktop
|
||||
# Visual Studio 2012
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe", "Vocaluxe\Vocaluxe.csproj", "{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{6F3E1874-F28A-40E9-AFBD-31934D593678} = {6F3E1874-F28A-40E9-AFBD-31934D593678}
|
||||
@@ -154,7 +154,4 @@ Global
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(Performance) = preSolution
|
||||
HasPerformanceSessions = true
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -105,7 +105,7 @@ namespace Vocaluxe.Screens
|
||||
_ButtonsJoker.Clear();
|
||||
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
|
||||
_ButtonsJoker.Add("ButtonJoker" + (i + 1));
|
||||
List<string> blist = new List<string>();
|
||||
var blist = new List<string>();
|
||||
blist.AddRange(_ButtonsJoker);
|
||||
blist.Add(_ButtonOptionsClose);
|
||||
blist.Add(_ButtonOptionsPlaylist);
|
||||
@@ -123,7 +123,7 @@ namespace Vocaluxe.Screens
|
||||
_TextsPlayer.Clear();
|
||||
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
|
||||
_TextsPlayer.Add("TextPlayer" + (i + 1));
|
||||
List<string> tlist = new List<string>();
|
||||
var tlist = new List<string>();
|
||||
tlist.AddRange(_TextsPlayer);
|
||||
tlist.Add(_TextCategory);
|
||||
tlist.Add(_TextSelection);
|
||||
@@ -172,7 +172,7 @@ namespace Vocaluxe.Screens
|
||||
{
|
||||
if (_SearchActive)
|
||||
_ApplyNewSearchFilter(_SearchText + keyEvent.Unicode);
|
||||
else if(!_Sso.Selection.PartyMode)
|
||||
else if (!_Sso.Selection.PartyMode)
|
||||
{
|
||||
_JumpTo(keyEvent.Unicode);
|
||||
return true;
|
||||
@@ -862,7 +862,7 @@ namespace Vocaluxe.Screens
|
||||
CGame.Reset();
|
||||
CGame.ClearSongs();
|
||||
|
||||
List<int> ids = new List<int>();
|
||||
var ids = new List<int>();
|
||||
for (int i = 0; i < CSongs.AllSongs.Count; i++)
|
||||
ids.Add(i);
|
||||
|
||||
@@ -870,7 +870,7 @@ namespace Vocaluxe.Screens
|
||||
{
|
||||
int songNr = ids[CGame.Rand.Next(ids.Count)];
|
||||
|
||||
EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||
var gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||
if (CSongs.AllSongs[songNr].IsDuet)
|
||||
gm = EGameMode.TR_GAMEMODE_DUET;
|
||||
|
||||
@@ -894,7 +894,7 @@ namespace Vocaluxe.Screens
|
||||
{
|
||||
int songNr = ids[CGame.Rand.Next(ids.Count)];
|
||||
|
||||
EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||
var gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||
if (CSongs.AllSongs[songNr].IsDuet)
|
||||
gm = EGameMode.TR_GAMEMODE_DUET;
|
||||
|
||||
@@ -1076,7 +1076,7 @@ namespace Vocaluxe.Screens
|
||||
if (visibleID > -1)
|
||||
_SongMenus[_SongMenu].SetSelectedSong(visibleID);
|
||||
}
|
||||
else if(!CSongs.IsInCategory)
|
||||
else if (!CSongs.IsInCategory)
|
||||
{
|
||||
ReadOnlyCollection<CCategory> categories = CSongs.Categories;
|
||||
int ct = categories.Count;
|
||||
@@ -1126,7 +1126,6 @@ namespace Vocaluxe.Screens
|
||||
|
||||
private void _ToggleSongOptions(ESongOptionsView view)
|
||||
{
|
||||
|
||||
_SelectSlides[_SelectSlideOptionsMode].Visible = false;
|
||||
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = false;
|
||||
_SelectSlides[_SelectSlideOptionsPlaylistOpen].Visible = false;
|
||||
@@ -1170,7 +1169,7 @@ namespace Vocaluxe.Screens
|
||||
|
||||
private void _ShowSongOptionsSong()
|
||||
{
|
||||
EGameMode lastMode = EGameMode.TR_GAMEMODE_NORMAL;
|
||||
var lastMode = EGameMode.TR_GAMEMODE_NORMAL;
|
||||
if (_AvailableGameModes.Count > 0)
|
||||
lastMode = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection];
|
||||
_AvailableGameModes.Clear();
|
||||
|
||||
Reference in new issue
Block a user