From 82b446684b4c1dfc2c708ee8e4e7bdf6dbef3f76 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Tue, 16 Apr 2013 17:41:55 +0200 Subject: [PATCH] Fixed Partymodes Fixed Text copy constructor --- .../Screens/PartyScreenTicTacToeConfig.xml | 4 ++-- .../PartyModeChallenge/CPartyModeChallenge.cs | 16 +++++++-------- .../CPartyModeChallengeMedley.cs | 20 +++++++++---------- .../PartyModeTicTacToe/CPartyModeTicTacToe.cs | 16 +++++++-------- Vocaluxe/Base/CSongs.cs | 4 ++-- Vocaluxe/Screens/CScreenSing.cs | 3 --- VocaluxeLib/Menu/CText.cs | 2 +- VocaluxeLib/Menu/SongMenu/CSong.cs | 4 ++-- 8 files changed, 33 insertions(+), 36 deletions(-) diff --git a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml index d9330b71..d3b98d11 100644 --- a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml +++ b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml @@ -82,7 +82,7 @@ Outline - TR_SCREENCONFIG_NUMPLAYERT1 + TR_SCREENCONFIG_NUMPLAYERST1 @@ -111,7 +111,7 @@ Outline - TR_SCREENCONFIG_NUMPLAYERT2 + TR_SCREENCONFIG_NUMPLAYERST2 diff --git a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs index 6b75ef48..5cf89c15 100644 --- a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs +++ b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs @@ -277,8 +277,8 @@ namespace VocaluxeLib.PartyModes.Challenge switch (_Stage) { case EStage.NotStarted: - _Screens.TryGetValue("PartyScreenChallengeConfig", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenChallengeConfig", out screen); + if (screen != null) { _ToScreenConfig.NumPlayer = _GameData.NumPlayer; _ToScreenConfig.NumPlayerAtOnce = _GameData.NumPlayerAtOnce; @@ -287,8 +287,8 @@ namespace VocaluxeLib.PartyModes.Challenge } break; case EStage.Config: - _Screens.TryGetValue("PartyScreenChallengeNames", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenChallengeNames", out screen); + if (screen != null) { _ToScreenNames.NumPlayer = _GameData.NumPlayer; _ToScreenNames.ProfileIDs = _GameData.ProfileIDs; @@ -296,8 +296,8 @@ namespace VocaluxeLib.PartyModes.Challenge } break; case EStage.Names: - _Screens.TryGetValue("PartyScreenChallengeMain", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenChallengeMain", out screen); + if (screen != null) { CBase.Songs.ResetPartySongSung(); _ToScreenMain.ResultTable = new List(); @@ -318,8 +318,8 @@ namespace VocaluxeLib.PartyModes.Challenge //nothing to do break; case EStage.Singing: - _Screens.TryGetValue("PartyScreenChallengeMain", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenChallengeMain", out screen); + if (screen != null) { _UpdateScores(); _ToScreenMain.CurrentRoundNr = _GameData.CurrentRoundNr; diff --git a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs index 9698e1bf..5bfb505e 100644 --- a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs +++ b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs @@ -282,8 +282,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley switch (_Stage) { case EStage.NotStarted: - _Screens.TryGetValue("PartyScreenChallengeMedleyConfig", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenChallengeMedleyConfig", out screen); + if (screen != null) { _ToScreenConfig.NumPlayer = _GameData.NumPlayer; _ToScreenConfig.NumPlayerAtOnce = _GameData.NumPlayerAtOnce; @@ -292,8 +292,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley } break; case EStage.Config: - _Screens.TryGetValue("PartyScreenChallengeMedleyNames", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenChallengeMedleyNames", out screen); + if (screen != null) { _ToScreenNames.NumPlayer = _GameData.NumPlayer; _ToScreenNames.ProfileIDs = _GameData.ProfileIDs; @@ -301,8 +301,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley } break; case EStage.Names: - _Screens.TryGetValue("PartyScreenChallengeMedleyMain", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenChallengeMedleyMain", out screen); + if (screen != null) { CBase.Songs.ResetPartySongSung(); _ToScreenMain.ResultTable = new List(); @@ -323,8 +323,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley //nothing to do break; case EStage.Singing: - _Screens.TryGetValue("PartyScreenChallengeMedleyMain", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenChallengeMedleyMain", out screen); + if (screen != null) { _UpdateScores(); _ToScreenMain.CurrentRoundNr = _GameData.CurrentRoundNr; @@ -510,7 +510,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley CSong[] visSongs = CBase.Songs.GetSongsNotSung(); if (visSongs == null) { - CBase.Log.LogError("PartyChallengeMedleyMode Error: There are no songs!"); + CBase.Log.LogError("CPartyChallengeMedleyMode Error: There are no songs!"); CBase.Graphics.FadeTo(EScreens.ScreenParty); return false; } @@ -526,7 +526,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley if (iDs.Count == 0) { - CBase.Log.LogError("PartyChallengeMedleyMode Error: There are no medley songs!"); + CBase.Log.LogError("CPartyChallengeMedleyMode Error: There are no medley songs!"); CBase.Graphics.FadeTo(EScreens.ScreenParty); return false; } diff --git a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs index f541c242..9adddc16 100644 --- a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs +++ b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs @@ -330,8 +330,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe switch (_Stage) { case EStage.NotStarted: - _Screens.TryGetValue("PartyScreenTicTacToeConfig", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenTicTacToeConfig", out screen); + if (screen != null) { _ToScreenConfig.NumPlayerTeam1 = _GameData.NumPlayerTeam1; _ToScreenConfig.NumPlayerTeam2 = _GameData.NumPlayerTeam2; @@ -344,8 +344,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe } break; case EStage.Config: - _Screens.TryGetValue("PartyScreenTicTacToeNames", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenTicTacToeNames", out screen); + if (screen != null) { _ToScreenNames.NumPlayerTeam1 = _GameData.NumPlayerTeam1; _ToScreenNames.NumPlayerTeam2 = _GameData.NumPlayerTeam2; @@ -355,8 +355,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe } break; case EStage.Names: - _Screens.TryGetValue("PartyScreenTicTacToeMain", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenTicTacToeMain", out screen); + if (screen != null) { if (_GameData.Team == 1) _GameData.Team = 0; @@ -388,8 +388,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe //nothing to do break; case EStage.Singing: - _Screens.TryGetValue("PartyScreenTicTacToeMain", out screen); - if (_Screens != null) + _Screens.TryGetValue("CPartyScreenTicTacToeMain", out screen); + if (screen != null) { if (_GameData.Team == 1) _GameData.Team = 0; diff --git a/Vocaluxe/Base/CSongs.cs b/Vocaluxe/Base/CSongs.cs index 20cf4335..8aa56dd6 100644 --- a/Vocaluxe/Base/CSongs.cs +++ b/Vocaluxe/Base/CSongs.cs @@ -394,8 +394,8 @@ namespace Vocaluxe.Base if (song != null) { song.ID = _Songs.Count; - _Songs.Add(song); - song.ReadNotes(); + if(song.ReadNotes()) + _Songs.Add(song); } } CLog.StopBenchmark(2, "Read TXTs"); diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 115d70fe..e9769d91 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -570,9 +570,6 @@ namespace Vocaluxe.Screens return; } - if (!song.NotesLoaded) - song.ReadNotes(); - string songname = song.Artist + " - " + song.Title; int rounds = CGame.GetNumSongs(); if (rounds > 1) diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index 5a2cbdb6..667119ab 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -278,7 +278,7 @@ namespace VocaluxeLib.Menu ReflectionSpace = text.ReflectionSpace; ReflectionHeight = text.ReflectionHeight; - _Text = text._Text; + Text = text.Text; Selected = text.Selected; Visible = text.Visible; Alpha = text.Alpha; diff --git a/VocaluxeLib/Menu/SongMenu/CSong.cs b/VocaluxeLib/Menu/SongMenu/CSong.cs index 37d73066..3e2ac247 100644 --- a/VocaluxeLib/Menu/SongMenu/CSong.cs +++ b/VocaluxeLib/Menu/SongMenu/CSong.cs @@ -613,10 +613,10 @@ namespace VocaluxeLib.Menu.SongMenu public bool ReadNotes() { - return ReadNotes(Path.Combine(Folder, FileName)); + return _ReadNotes(Path.Combine(Folder, FileName)); } - public bool ReadNotes(string filePath, bool forceReload = false) + private bool _ReadNotes(string filePath, bool forceReload = false) { //Skip loading if already done and no reload is forced if (_NotesLoaded && !forceReload)