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

Merge remote-tracking branch 'upstream/develop' into 6-player

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-04-09 11:20:01 +02:00
2 parents df0688d563 70192b8213
commit 3fa7393014
2 files changed
+2 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CSettings.cs
+2 -2
View File
@@ -43,11 +43,11 @@ namespace Vocaluxe.Base
public const string sProgramCodeName = "6 Player Test"; public const string sProgramCodeName = "6 Player Test";
public const int iVersionMajor = 0; public const int iVersionMajor = 0;
public const int iVersionMinor = 1; // milestones public const int iVersionMinor = 2; // milestones
public const int iVersionSub = 0; // steps public const int iVersionSub = 0; // steps
public const ERevision VersionRevision = ERevision.Alpha; public const ERevision VersionRevision = ERevision.Alpha;
public const int iBuild = 60; // Increase on every published version! Never Reset! public const int iBuild = 61; // Increase on every published version! Never Reset!
public const int iDatabaseHighscoreVersion = 1; public const int iDatabaseHighscoreVersion = 1;
public const int iDatabaseCoverVersion = 1; public const int iDatabaseCoverVersion = 1;
Vocaluxe/Screens/CScreenLoad.cs
-5
View File
@@ -152,11 +152,6 @@ namespace Vocaluxe.Screens
else else
_timer.Start(); _timer.Start();
if (CSongs.SongsLoaded && CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && _timer.ElapsedMilliseconds > 1000L)
{
CSongs.LoadCover(0L, 1);
}
bool next = ((CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && CSongs.CoverLoaded) || bool next = ((CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && CSongs.CoverLoaded) ||
CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART); CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART);