added partymodeID to all elements, fixed bug in buttons (text was drawn twice)

This commit is contained in:
Alexander Eckart committed 2012-12-15 18:40:22 +01:00
1 parent 632206c317
commit 9257e6f134
32 files changed
+725 -136

No files matched your search

+7 -5
View File
@@ -42,6 +42,7 @@ namespace Vocaluxe.Menu.SingNotes
public abstract class CSingNotes : ISingNotes, IMenuElement
{
protected int _PartyModeID;
private Basic _Base;
private SThemeSingBar _Theme;
private bool _ThemeLoaded;
@@ -63,8 +64,9 @@ namespace Vocaluxe.Menu.SingNotes
set { _BarPos = value; }
}
public CSingNotes(Basic Base)
public CSingNotes(Basic Base, int PartyModeID)
{
_PartyModeID = PartyModeID;
_Base = Base;
_Theme = new SThemeSingBar();
_ThemeLoaded = false;
@@ -618,7 +620,7 @@ namespace Vocaluxe.Menu.SingNotes
);
int numstars = (int)(r.W * 0.25f);
CParticleEffect stars = new CParticleEffect(_Base, numstars, new SColorF(1f, 1f, 0f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Star);
CParticleEffect stars = new CParticleEffect(_Base, _PartyModeID, numstars, new SColorF(1f, 1f, 0f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Star);
_PlayerNotes[n].GoldenStars.Add(stars);
}
}
@@ -646,7 +648,7 @@ namespace Vocaluxe.Menu.SingNotes
Rect.Z
);
CParticleEffect flares = new CParticleEffect(_Base, 15, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Flare);
CParticleEffect flares = new CParticleEffect(_Base, _PartyModeID, 15, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Flare);
_PlayerNotes[n].Flares.Add(flares);
}
@@ -686,13 +688,13 @@ namespace Vocaluxe.Menu.SingNotes
Rect.Z
);
CParticleEffect stars = new CParticleEffect(_Base, _Base.Game.GetRandom(2) + 1, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinPerfectNoteStarName, 35, EParticeType.PerfNoteStar);
CParticleEffect stars = new CParticleEffect(_Base, _PartyModeID, _Base.Game.GetRandom(2) + 1, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinPerfectNoteStarName, 35, EParticeType.PerfNoteStar);
_PlayerNotes[n].PerfectNoteEffect.Add(stars);
}
private void AddPerfectLine(int n)
{
CParticleEffect twinkle = new CParticleEffect(_Base, 200, _PlayerNotes[n].Color, _PlayerNotes[n].Rect, _Theme.SkinGoldenStarName, 25, EParticeType.Twinkle);
CParticleEffect twinkle = new CParticleEffect(_Base, _PartyModeID, 200, _PlayerNotes[n].Color, _PlayerNotes[n].Rect, _Theme.SkinGoldenStarName, 25, EParticeType.Twinkle);
_PlayerNotes[n].PerfectLineTwinkle.Add(twinkle);
}