Merge remote-tracking branch 'upstream/develop' into 6-player
This commit is contained in:
commit
3fa7393014
2 files changed
+3
-8
No files matched your search
@@ -43,11 +43,11 @@ namespace Vocaluxe.Base
|
||||
public const string sProgramCodeName = "6 Player Test";
|
||||
|
||||
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 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 iDatabaseCoverVersion = 1;
|
||||
|
||||
@@ -150,12 +150,7 @@ namespace Vocaluxe.Screens
|
||||
if (CSettings.GameState == EGameState.EditTheme)
|
||||
_timer.Stop();
|
||||
else
|
||||
_timer.Start();
|
||||
|
||||
if (CSongs.SongsLoaded && CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && _timer.ElapsedMilliseconds > 1000L)
|
||||
{
|
||||
CSongs.LoadCover(0L, 1);
|
||||
}
|
||||
_timer.Start();
|
||||
|
||||
bool next = ((CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && CSongs.CoverLoaded) ||
|
||||
CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART);
|
||||
|
||||
Reference in new issue
Block a user