Fixed song-bug. Thx Darkice.

This commit is contained in:
Florian Kuepper committed 2012-07-11 20:00:47 +02:00
1 parent dbb5157420
commit 5062eb4b16
2 files changed
+5 -8

No files matched your search

+4 -2
View File
@@ -108,6 +108,7 @@ namespace Vocaluxe.GameModes
protected List<SongQueque> _SongQueque; protected List<SongQueque> _SongQueque;
protected int _CurrentSong; protected int _CurrentSong;
protected CPoints _Points; protected CPoints _Points;
private CSong CopiedSong;
#region Implementation #region Implementation
public virtual void Init() public virtual void Init()
@@ -228,6 +229,7 @@ namespace Vocaluxe.GameModes
_SongQueque[_CurrentSong].GameMode == EGameMode.TR_GAMEMODE_MEDLEY, _SongQueque[_CurrentSong].GameMode == EGameMode.TR_GAMEMODE_MEDLEY,
_SongQueque[_CurrentSong].GameMode == EGameMode.TR_GAMEMODE_DUET, _SongQueque[_CurrentSong].GameMode == EGameMode.TR_GAMEMODE_DUET,
_SongQueque[_CurrentSong].GameMode == EGameMode.TR_GAMEMODE_SHORTSONG); _SongQueque[_CurrentSong].GameMode == EGameMode.TR_GAMEMODE_SHORTSONG);
CSongs.AllSongs[_CurrentSong] = CopiedSong;
} }
_CurrentSong++; _CurrentSong++;
} }
@@ -247,8 +249,8 @@ namespace Vocaluxe.GameModes
{ {
if (_CurrentSong >= 0 && _CurrentSong < _SongQueque.Count) if (_CurrentSong >= 0 && _CurrentSong < _SongQueque.Count)
{ {
CSong song = (CSong)CSongs.GetSong(_SongQueque[_CurrentSong].SongID).Clone(); CSong song = CSongs.GetSong(_SongQueque[_CurrentSong].SongID);
song.Notes = (CNotes)CSongs.GetSong(_SongQueque[_CurrentSong].SongID).Notes.Clone(); CopiedSong = (CSong)song.Clone();
switch (GetCurrentGameMode()) switch (GetCurrentGameMode())
{ {
+1 -6
View File
@@ -6,7 +6,7 @@ using Vocaluxe.Base;
namespace Vocaluxe.Lib.Song namespace Vocaluxe.Lib.Song
{ {
class CNotes : ICloneable class CNotes
{ {
private List<CLines> _Lines = new List<CLines>(); private List<CLines> _Lines = new List<CLines>();
@@ -79,11 +79,6 @@ namespace Vocaluxe.Lib.Song
lines.SetMedley(StartBeat, EndBeat); lines.SetMedley(StartBeat, EndBeat);
} }
} }
public object Clone()
{
return base.MemberwiseClone();
}
} }
public enum ENoteType public enum ENoteType