diff --git a/Output/CreditsRessourcesDB.sqlite b/Output/CreditsRessourcesDB.sqlite index 5701709f..d5dbafb9 100644 Binary files a/Output/CreditsRessourcesDB.sqlite and b/Output/CreditsRessourcesDB.sqlite differ diff --git a/Vocaluxe/Lib/Database/CResourceDB.cs b/Vocaluxe/Lib/Database/CResourceDB.cs index 77d9c455..0da33eb9 100644 --- a/Vocaluxe/Lib/Database/CResourceDB.cs +++ b/Vocaluxe/Lib/Database/CResourceDB.cs @@ -38,7 +38,7 @@ namespace Vocaluxe.Lib.Database private readonly string[] _FilesV1 = new string[] { "Logo_voc.png", "PerfectNoteStar.png", "redDot.png", "blueDot.png", "brunzel.png", "Darkice.png", "flokuep.png", "flamefire.png", "bohning.png", "mesand.png", - "babene03.png", "pantero.png", "Pinky007.png" + "babene03.png", "lukeIam.png" }; #endif public CResourceDB(string filePath) : base(filePath) {} diff --git a/Vocaluxe/Screens/CScreenCredits.cs b/Vocaluxe/Screens/CScreenCredits.cs index bf585e2f..7b9eb5cd 100644 --- a/Vocaluxe/Screens/CScreenCredits.cs +++ b/Vocaluxe/Screens/CScreenCredits.cs @@ -137,11 +137,10 @@ namespace Vocaluxe.Screens private CTextureRef _TexNameDarkice; private CTextureRef _TexNameFlokuep; private CTextureRef _TexNameFlamefire; + private CTextureRef _TexNameLukeIam; private CTextureRef _TexNameMesand; private CTextureRef _TexNameBohning; private CTextureRef _TexNameBabene03; - private CTextureRef _TexNamePantero; - private CTextureRef _TexNamePinky007; private SThemeBackground _BGTheme; @@ -208,11 +207,10 @@ namespace Vocaluxe.Screens ressourceOK &= CDataBase.GetCreditsRessource("Darkice.png", ref _TexNameDarkice); ressourceOK &= CDataBase.GetCreditsRessource("flokuep.png", ref _TexNameFlokuep); ressourceOK &= CDataBase.GetCreditsRessource("flamefire.png", ref _TexNameFlamefire); + ressourceOK &= CDataBase.GetCreditsRessource("lukeIam.png", ref _TexNameLukeIam); ressourceOK &= CDataBase.GetCreditsRessource("bohning.png", ref _TexNameBohning); ressourceOK &= CDataBase.GetCreditsRessource("mesand.png", ref _TexNameMesand); ressourceOK &= CDataBase.GetCreditsRessource("babene03.png", ref _TexNameBabene03); - ressourceOK &= CDataBase.GetCreditsRessource("pantero.png", ref _TexNamePantero); - ressourceOK &= CDataBase.GetCreditsRessource("Pinky007.png", ref _TexNamePinky007); if (!ressourceOK) CLog.LogError("Could not load all ressources!", true, true); @@ -228,6 +226,7 @@ namespace Vocaluxe.Screens continue; string newLine = " " + paragraph[e]; CText text = GetNewText(75, lastY, -2, 25, -1, EAlignment.Left, EStyle.Bold, "Outline", new SColorF(1, 1, 1, 1), line); + text.Visible = false; if (CFonts.GetTextBounds(text).Width < (CSettings.RenderW - 220)) { line += newLine; @@ -247,6 +246,7 @@ namespace Vocaluxe.Screens line = newLine; lastY += 27; } + _AddText(text); } } @@ -273,11 +273,10 @@ namespace Vocaluxe.Screens _AddNewCreditName(_TexNameDarkice, 360, 55, true); _AddNewCreditName(_TexNameFlokuep, 214, 14, true); _AddNewCreditName(_TexNameFlamefire, 496, 46, true); + _AddNewCreditName(_TexNameLukeIam, 411, 26, true); _AddNewCreditName(_TexNameBohning, 383, 54, false); _AddNewCreditName(_TexNameMesand, 525, 13, false); _AddNewCreditName(_TexNameBabene03, 33, 26, false); - _AddNewCreditName(_TexNamePantero, 311, 45, false); - _AddNewCreditName(_TexNamePinky007, 113, 50, false); } public override void ReloadTheme(string xmlPath) {} @@ -314,7 +313,7 @@ namespace Vocaluxe.Screens public override bool UpdateGame() { - if (!_Animation()) + if (!_Animation() && CGraphics.NextScreen != CGraphics.GetScreen(EScreen.Main)) CGraphics.FadeTo(EScreen.Main); return true; } @@ -465,7 +464,7 @@ namespace Vocaluxe.Screens } if (_TextTimer.IsRunning) - active = _TextTimer.ElapsedMilliseconds <= 60000; + active = _TextTimer.ElapsedMilliseconds <= 500; return active; } diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index 548d10fa..c6892bf6 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -84,6 +84,8 @@ namespace VocaluxeLib.Menu _PartyModeID = partyModeID; ThemeLoaded = true; + + LoadSkin(); } #endregion Constructors diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index 4f63e1e6..3a923a6d 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -261,7 +261,7 @@ namespace VocaluxeLib.Menu float rheight = 0, float rspace = 0) : this(partyModeID) { - _Theme = new SThemeText {FontFamily = fontFamily, FontStyle = style, FontHeight = h, Text = text}; + _Theme = new SThemeText { FontFamily = fontFamily, FontStyle = style, FontHeight = h, Text = text, Color = { A = col.A, B = col.B, G = col.G, R = col.R } }; ThemeLoaded = false; _ButtonText = false;