Fix wrong comparisons

This commit is contained in:
Flamefire committed 2013-10-13 00:27:03 +02:00
1 parent 42ac648fc1
commit d41779b6f2
3 files changed
+6 -9

No files matched your search

+4 -7
View File
@@ -819,8 +819,7 @@ namespace Vocaluxe.Screens
CGame.Reset(); CGame.Reset();
CGame.ClearSongs(); CGame.ClearSongs();
CGame.AddVisibleSong(songNr, gm); if (CGame.AddVisibleSong(songNr, gm))
CGraphics.FadeTo(EScreens.ScreenNames); CGraphics.FadeTo(EScreens.ScreenNames);
} }
} }
@@ -834,8 +833,7 @@ namespace Vocaluxe.Screens
CGame.Reset(); CGame.Reset();
CGame.ClearSongs(); CGame.ClearSongs();
CGame.AddVisibleSong(songNr, gm); if (CGame.AddVisibleSong(songNr, gm))
CGraphics.FadeTo(EScreens.ScreenNames); CGraphics.FadeTo(EScreens.ScreenNames);
} }
} }
@@ -844,13 +842,12 @@ namespace Vocaluxe.Screens
{ {
if ((CSongs.Category >= 0) && (songNr >= 0)) if ((CSongs.Category >= 0) && (songNr >= 0))
{ {
if (CSongs.VisibleSongs[songNr].IsGameModeAvailable(EGameMode.TR_GAMEMODE_MEDLEY)) if (!CSongs.VisibleSongs[songNr].IsGameModeAvailable(EGameMode.TR_GAMEMODE_MEDLEY))
return; return;
CGame.Reset(); CGame.Reset();
CGame.ClearSongs(); CGame.ClearSongs();
CGame.AddVisibleSong(songNr, EGameMode.TR_GAMEMODE_MEDLEY); if (CGame.AddVisibleSong(songNr, EGameMode.TR_GAMEMODE_MEDLEY))
CGraphics.FadeTo(EScreens.ScreenNames); CGraphics.FadeTo(EScreens.ScreenNames);
} }
} }
+1 -1
View File
@@ -69,7 +69,7 @@ namespace Vocaluxe.SongQueue
private bool _AddSong(int songID, EGameMode gameMode) private bool _AddSong(int songID, EGameMode gameMode)
{ {
if (CSongs.GetSong(songID).IsGameModeAvailable(gameMode)) if (!CSongs.GetSong(songID).IsGameModeAvailable(gameMode))
return false; return false;
_SongQueue.Add(new SSongQueueEntry(songID, gameMode)); _SongQueue.Add(new SSongQueueEntry(songID, gameMode));
+1 -1
View File
@@ -99,7 +99,7 @@ namespace VocaluxeLib.Songs
_LineNr = 0; _LineNr = 0;
try try
{ {
sr = useSetEncoding ? new StreamReader(filePath, _Song.Encoding, true) : new StreamReader(filePath, true); sr = new StreamReader(filePath, _Song.Encoding, true);
while (!sr.EndOfStream) while (!sr.EndOfStream)
{ {
string line = sr.ReadLine(); string line = sr.ReadLine();