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

Fix wrong comparisons

Browse Source
This commit is contained in:
Flamefire committed 2013-10-13 00:27:03 +02:00
1 parent 42ac648fc1
commit d41779b6f2
3 files changed
+10 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Screens/CScreenSong.cs
+7 -10
View File
@@ -819,9 +819,8 @@ 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,9 +833,8 @@ 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,14 +842,13 @@ 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);
} }
} }
Vocaluxe/SongQueue/CSongQueue.cs
+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));
VocaluxeLib/Songs/CSongLoader.cs
+2 -2
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();
@@ -712,7 +712,7 @@ namespace VocaluxeLib.Songs
if (changesMade.IsModified) if (changesMade.IsModified)
{ {
string msg = "Automatic changes have been made to " + filePath + " Please check result!\r\n" + changesMade; string msg = "Automatic changes have been made to " + filePath + " Please check result!\r\n" + changesMade;
CBase.Log.LogError("Warning:" + msg); CBase.Log.LogError("Warning: " + msg);
if (CBase.Config.GetSaveModifiedSongs() == EOffOn.TR_CONFIG_ON) if (CBase.Config.GetSaveModifiedSongs() == EOffOn.TR_CONFIG_ON)
{ {
string name = Path.GetFileNameWithoutExtension(_Song.FileName); string name = Path.GetFileNameWithoutExtension(_Song.FileName);