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

Fixed Partymodes

Browse Source 
Fixed Text copy constructor
This commit is contained in:
Flamefire committed 2013-04-16 17:41:55 +02:00
1 parent 55849376ba
commit 82b446684b
8 files changed
+33 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml
+2 -2
View File
@@ -82,7 +82,7 @@
<!--<Font>: Text font name--> <!--<Font>: Text font name-->
<Font>Outline</Font> <Font>Outline</Font>
<!--<Text>: Nothing or translation tag--> <!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENCONFIG_NUMPLAYERT1</Text> <Text>TR_SCREENCONFIG_NUMPLAYERST1</Text>
<!--<Reflection> If exists:--> <!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
@@ -111,7 +111,7 @@
<!--<Font>: Text font name--> <!--<Font>: Text font name-->
<Font>Outline</Font> <Font>Outline</Font>
<!--<Text>: Nothing or translation tag--> <!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENCONFIG_NUMPLAYERT2</Text> <Text>TR_SCREENCONFIG_NUMPLAYERST2</Text>
<!--<Reflection> If exists:--> <!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
+8 -8
View File
@@ -277,8 +277,8 @@ namespace VocaluxeLib.PartyModes.Challenge
switch (_Stage) switch (_Stage)
{ {
case EStage.NotStarted: case EStage.NotStarted:
_Screens.TryGetValue("PartyScreenChallengeConfig", out screen); _Screens.TryGetValue("CPartyScreenChallengeConfig", out screen);
if (_Screens != null) if (screen != null)
{ {
_ToScreenConfig.NumPlayer = _GameData.NumPlayer; _ToScreenConfig.NumPlayer = _GameData.NumPlayer;
_ToScreenConfig.NumPlayerAtOnce = _GameData.NumPlayerAtOnce; _ToScreenConfig.NumPlayerAtOnce = _GameData.NumPlayerAtOnce;
@@ -287,8 +287,8 @@ namespace VocaluxeLib.PartyModes.Challenge
} }
break; break;
case EStage.Config: case EStage.Config:
_Screens.TryGetValue("PartyScreenChallengeNames", out screen); _Screens.TryGetValue("CPartyScreenChallengeNames", out screen);
if (_Screens != null) if (screen != null)
{ {
_ToScreenNames.NumPlayer = _GameData.NumPlayer; _ToScreenNames.NumPlayer = _GameData.NumPlayer;
_ToScreenNames.ProfileIDs = _GameData.ProfileIDs; _ToScreenNames.ProfileIDs = _GameData.ProfileIDs;
@@ -296,8 +296,8 @@ namespace VocaluxeLib.PartyModes.Challenge
} }
break; break;
case EStage.Names: case EStage.Names:
_Screens.TryGetValue("PartyScreenChallengeMain", out screen); _Screens.TryGetValue("CPartyScreenChallengeMain", out screen);
if (_Screens != null) if (screen != null)
{ {
CBase.Songs.ResetPartySongSung(); CBase.Songs.ResetPartySongSung();
_ToScreenMain.ResultTable = new List<CResultTableRow>(); _ToScreenMain.ResultTable = new List<CResultTableRow>();
@@ -318,8 +318,8 @@ namespace VocaluxeLib.PartyModes.Challenge
//nothing to do //nothing to do
break; break;
case EStage.Singing: case EStage.Singing:
_Screens.TryGetValue("PartyScreenChallengeMain", out screen); _Screens.TryGetValue("CPartyScreenChallengeMain", out screen);
if (_Screens != null) if (screen != null)
{ {
_UpdateScores(); _UpdateScores();
_ToScreenMain.CurrentRoundNr = _GameData.CurrentRoundNr; _ToScreenMain.CurrentRoundNr = _GameData.CurrentRoundNr;
PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
+10 -10
View File
@@ -282,8 +282,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
switch (_Stage) switch (_Stage)
{ {
case EStage.NotStarted: case EStage.NotStarted:
_Screens.TryGetValue("PartyScreenChallengeMedleyConfig", out screen); _Screens.TryGetValue("CPartyScreenChallengeMedleyConfig", out screen);
if (_Screens != null) if (screen != null)
{ {
_ToScreenConfig.NumPlayer = _GameData.NumPlayer; _ToScreenConfig.NumPlayer = _GameData.NumPlayer;
_ToScreenConfig.NumPlayerAtOnce = _GameData.NumPlayerAtOnce; _ToScreenConfig.NumPlayerAtOnce = _GameData.NumPlayerAtOnce;
@@ -292,8 +292,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
} }
break; break;
case EStage.Config: case EStage.Config:
_Screens.TryGetValue("PartyScreenChallengeMedleyNames", out screen); _Screens.TryGetValue("CPartyScreenChallengeMedleyNames", out screen);
if (_Screens != null) if (screen != null)
{ {
_ToScreenNames.NumPlayer = _GameData.NumPlayer; _ToScreenNames.NumPlayer = _GameData.NumPlayer;
_ToScreenNames.ProfileIDs = _GameData.ProfileIDs; _ToScreenNames.ProfileIDs = _GameData.ProfileIDs;
@@ -301,8 +301,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
} }
break; break;
case EStage.Names: case EStage.Names:
_Screens.TryGetValue("PartyScreenChallengeMedleyMain", out screen); _Screens.TryGetValue("CPartyScreenChallengeMedleyMain", out screen);
if (_Screens != null) if (screen != null)
{ {
CBase.Songs.ResetPartySongSung(); CBase.Songs.ResetPartySongSung();
_ToScreenMain.ResultTable = new List<CResultTableRow>(); _ToScreenMain.ResultTable = new List<CResultTableRow>();
@@ -323,8 +323,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
//nothing to do //nothing to do
break; break;
case EStage.Singing: case EStage.Singing:
_Screens.TryGetValue("PartyScreenChallengeMedleyMain", out screen); _Screens.TryGetValue("CPartyScreenChallengeMedleyMain", out screen);
if (_Screens != null) if (screen != null)
{ {
_UpdateScores(); _UpdateScores();
_ToScreenMain.CurrentRoundNr = _GameData.CurrentRoundNr; _ToScreenMain.CurrentRoundNr = _GameData.CurrentRoundNr;
@@ -510,7 +510,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
CSong[] visSongs = CBase.Songs.GetSongsNotSung(); CSong[] visSongs = CBase.Songs.GetSongsNotSung();
if (visSongs == null) 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); CBase.Graphics.FadeTo(EScreens.ScreenParty);
return false; return false;
} }
@@ -526,7 +526,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
if (iDs.Count == 0) 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); CBase.Graphics.FadeTo(EScreens.ScreenParty);
return false; return false;
} }
PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
+8 -8
View File
@@ -330,8 +330,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
switch (_Stage) switch (_Stage)
{ {
case EStage.NotStarted: case EStage.NotStarted:
_Screens.TryGetValue("PartyScreenTicTacToeConfig", out screen); _Screens.TryGetValue("CPartyScreenTicTacToeConfig", out screen);
if (_Screens != null) if (screen != null)
{ {
_ToScreenConfig.NumPlayerTeam1 = _GameData.NumPlayerTeam1; _ToScreenConfig.NumPlayerTeam1 = _GameData.NumPlayerTeam1;
_ToScreenConfig.NumPlayerTeam2 = _GameData.NumPlayerTeam2; _ToScreenConfig.NumPlayerTeam2 = _GameData.NumPlayerTeam2;
@@ -344,8 +344,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
} }
break; break;
case EStage.Config: case EStage.Config:
_Screens.TryGetValue("PartyScreenTicTacToeNames", out screen); _Screens.TryGetValue("CPartyScreenTicTacToeNames", out screen);
if (_Screens != null) if (screen != null)
{ {
_ToScreenNames.NumPlayerTeam1 = _GameData.NumPlayerTeam1; _ToScreenNames.NumPlayerTeam1 = _GameData.NumPlayerTeam1;
_ToScreenNames.NumPlayerTeam2 = _GameData.NumPlayerTeam2; _ToScreenNames.NumPlayerTeam2 = _GameData.NumPlayerTeam2;
@@ -355,8 +355,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
} }
break; break;
case EStage.Names: case EStage.Names:
_Screens.TryGetValue("PartyScreenTicTacToeMain", out screen); _Screens.TryGetValue("CPartyScreenTicTacToeMain", out screen);
if (_Screens != null) if (screen != null)
{ {
if (_GameData.Team == 1) if (_GameData.Team == 1)
_GameData.Team = 0; _GameData.Team = 0;
@@ -388,8 +388,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
//nothing to do //nothing to do
break; break;
case EStage.Singing: case EStage.Singing:
_Screens.TryGetValue("PartyScreenTicTacToeMain", out screen); _Screens.TryGetValue("CPartyScreenTicTacToeMain", out screen);
if (_Screens != null) if (screen != null)
{ {
if (_GameData.Team == 1) if (_GameData.Team == 1)
_GameData.Team = 0; _GameData.Team = 0;
Vocaluxe/Base/CSongs.cs
+2 -2
View File
@@ -394,8 +394,8 @@ namespace Vocaluxe.Base
if (song != null) if (song != null)
{ {
song.ID = _Songs.Count; song.ID = _Songs.Count;
_Songs.Add(song); if(song.ReadNotes())
song.ReadNotes(); _Songs.Add(song);
} }
} }
CLog.StopBenchmark(2, "Read TXTs"); CLog.StopBenchmark(2, "Read TXTs");
Vocaluxe/Screens/CScreenSing.cs
-3
View File
@@ -570,9 +570,6 @@ namespace Vocaluxe.Screens
return; return;
} }
if (!song.NotesLoaded)
song.ReadNotes();
string songname = song.Artist + " - " + song.Title; string songname = song.Artist + " - " + song.Title;
int rounds = CGame.GetNumSongs(); int rounds = CGame.GetNumSongs();
if (rounds > 1) if (rounds > 1)
VocaluxeLib/Menu/CText.cs
+1 -1
View File
@@ -278,7 +278,7 @@ namespace VocaluxeLib.Menu
ReflectionSpace = text.ReflectionSpace; ReflectionSpace = text.ReflectionSpace;
ReflectionHeight = text.ReflectionHeight; ReflectionHeight = text.ReflectionHeight;
_Text = text._Text; Text = text.Text;
Selected = text.Selected; Selected = text.Selected;
Visible = text.Visible; Visible = text.Visible;
Alpha = text.Alpha; Alpha = text.Alpha;
VocaluxeLib/Menu/SongMenu/CSong.cs
+2 -2
View File
@@ -613,10 +613,10 @@ namespace VocaluxeLib.Menu.SongMenu
public bool ReadNotes() 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 //Skip loading if already done and no reload is forced
if (_NotesLoaded && !forceReload) if (_NotesLoaded && !forceReload)