Merge branch 'release-0.1' into develop

This commit is contained in:
Alexander Eckart committed 2012-03-24 17:11:40 +01:00
commit 042ba7d207
4 files changed
+6 -6

No files matched your search

+2 -2
View File
@@ -107,8 +107,8 @@ Vocaluxe.exe -ConfigFile MyConfig.xml -ScoreFile C:\Vocaluxe\Highscores\MyHighsc
[TAB] to open the background music controls (not on all screens). [TAB] to open the background music controls (not on all screens).
Songscreen Songscreen
[R] to select a random song [CTRL] + [R] to select a random song
[F3] or [CTRL]+[F] to open/close the song search menu [F3] to open/close the song search menu
[A] to sing all songs from a category [A] to sing all songs from a category
+1 -1
View File
@@ -237,7 +237,7 @@ namespace Vocaluxe.Base
public static bool IsGuestProfile(int ProfileNr) public static bool IsGuestProfile(int ProfileNr)
{ {
if (ProfileNr < 0 || ProfileNr >= _Profiles.Count) if (ProfileNr < 0 || ProfileNr >= _Profiles.Count)
return false; return true; // this will prevent from saving dummy profiles to highscore db
return _Profiles[ProfileNr].GuestProfile == EOffOn.TR_CONFIG_ON; return _Profiles[ProfileNr].GuestProfile == EOffOn.TR_CONFIG_ON;
} }
+2 -2
View File
@@ -45,9 +45,9 @@ namespace Vocaluxe.Base
public const int iVersionMajor = 0; public const int iVersionMajor = 0;
public const int iVersionMinor = 1; // milestones public const int iVersionMinor = 1; // milestones
public const int iVersionSub = 0; // steps public const int iVersionSub = 0; // steps
public const ERevision VersionRevision = ERevision.Beta; public const ERevision VersionRevision = ERevision.RC;
public const int iBuild = 57; // Increase on every published version! Never Reset! public const int iBuild = 59; // 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;
+1 -1
View File
@@ -223,7 +223,7 @@ namespace Vocaluxe.Screens
for (int p = 0; p < player.Length; p++) for (int p = 0; p < player.Length; p++)
{ {
if (player[p].Points > CSettings.MinScoreForDB && player[p].SongFinished && !CProfiles.IsGuestProfile(p)) if (player[p].Points > CSettings.MinScoreForDB && player[p].SongFinished && !CProfiles.IsGuestProfile(player[p].ProfileID))
_NewEntryIDs.Add(CDataBase.AddScore(player[p])); _NewEntryIDs.Add(CDataBase.AddScore(player[p]));
} }
} }