Changed string comparisons to easier != "" syntax

This commit is contained in:
Flamefire committed 2013-04-23 14:52:51 +02:00
1 parent 1540be9120
commit cf39a4b107
74 files changed
+318 -338

No files matched your search

@@ -456,16 +456,16 @@ namespace VocaluxeLib.PartyModes.TicTacToe
return _ScreenSongOptions;
}
// ReSharper disable RedundantAssignment
// ReSharper disable RedundantAssignment
public override void OnSongChange(int songIndex, ref SScreenSongOptions screenSongOptions)
// ReSharper restore RedundantAssignment
// ReSharper restore RedundantAssignment
{
screenSongOptions = _ScreenSongOptions;
}
// ReSharper disable RedundantAssignment
// ReSharper disable RedundantAssignment
public override void OnCategoryChange(int categoryIndex, ref SScreenSongOptions screenSongOptions)
// ReSharper restore RedundantAssignment
// ReSharper restore RedundantAssignment
{
screenSongOptions = _ScreenSongOptions;
}
@@ -24,9 +24,9 @@ using VocaluxeLib.Menu;
namespace VocaluxeLib.PartyModes.TicTacToe
{
// ReSharper disable UnusedMember.Global
// ReSharper disable UnusedMember.Global
public class CPartyScreenTicTacToeConfig : CMenuParty
// ReSharper restore UnusedMember.Global
// ReSharper restore UnusedMember.Global
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion
@@ -289,7 +289,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_ConfigOk = false;
for (int i = 0; i < CBase.Songs.NumSongsInCategory(_Data.ScreenConfig.CategoryID); i++)
{
_ConfigOk=CBase.Songs.GetVisibleSong(i).AvailableGameModes.Any(mode => mode == gm);
_ConfigOk = CBase.Songs.GetVisibleSong(i).AvailableGameModes.Any(mode => mode == gm);
if (_ConfigOk)
break;
}
@@ -353,7 +353,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{
_Texts[_TextFinishMessage].Color = CBase.Theme.GetPlayerColor(winner);
_Texts[_TextFinishMessage].Text = CBase.Language.Translate("TR_SCREENMAIN_WINNER", _PartyModeID) + " " + CBase.Language.Translate("TR_TEAM", _PartyModeID) + " " +
winner;
winner;
}
else
{
@@ -607,7 +607,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{
_Texts[_TextTeamChoosing].Color = CBase.Theme.GetPlayerColor(_GameData.Team + 1);
_Texts[_TextTeamChoosing].Text = CBase.Language.Translate("TR_TEAM", _PartyModeID) + " " + (_GameData.Team + 1) + "! " +
CBase.Language.Translate("TR_SCREENMAIN_TEAM_CHOOSE", _PartyModeID);
CBase.Language.Translate("TR_SCREENMAIN_TEAM_CHOOSE", _PartyModeID);
if (_Status == EStatus.JokerRetry || _Status == EStatus.FieldChoosing)
_Texts[_TextTeamChoosing].Visible = true;
else
@@ -24,9 +24,9 @@ using VocaluxeLib.Menu;
namespace VocaluxeLib.PartyModes.TicTacToe
{
// ReSharper disable UnusedMember.Global
// ReSharper disable UnusedMember.Global
public class CPartyScreenTicTacToeNames : CMenuParty
// ReSharper restore UnusedMember.Global
// ReSharper restore UnusedMember.Global
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion
@@ -405,7 +405,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_UpdateButtonPlayerChoose(_PlayerChooseButtonsOffset);
_Buttons[_ButtonPlayerChooseScrollUp].Enabled = _PlayerChooseButtonsOffset > 0;
_Buttons[_ButtonPlayerChooseScrollDown].Enabled = _PlayerChooseButtonsVisibleProfiles.Count >
_PlayerChooseButtons.Count + _PlayerChooseButtonsOffset * _PlayerChooseButtonsNumH;
_PlayerChooseButtons.Count + _PlayerChooseButtonsOffset * _PlayerChooseButtonsNumH;
}
private void _UpdateButtonPlayerChoose(int offset)