changed base handling in VocaluxeLib

This commit is contained in:
Alexander Eckart committed 2013-02-22 17:57:47 +01:00
1 parent 08658e20e3
commit b4f77d50b2
42 files changed
+801 -924

No files matched your search

+3 -6
View File
@@ -24,7 +24,6 @@ namespace Vocaluxe.Menu
public class CScreenSetting : IMenuElement
{
private int _PartyModeID;
private Basic _Base;
private SScreenSetting _Theme;
private bool _ThemeLoaded;
@@ -34,10 +33,9 @@ namespace Vocaluxe.Menu
return _Theme.Name;
}
public CScreenSetting(Basic Base, int PartyModeID)
public CScreenSetting(int PartyModeID)
{
_PartyModeID = PartyModeID;
_Base = Base;
_Theme = new SScreenSetting();
_ThemeLoaded = false;
}
@@ -45,7 +43,6 @@ namespace Vocaluxe.Menu
public CScreenSetting(CScreenSetting ts)
{
_PartyModeID = ts._PartyModeID;
_Base = ts._Base;
_Theme = ts._Theme;
_ThemeLoaded = ts._ThemeLoaded;
}
@@ -128,12 +125,12 @@ namespace Vocaluxe.Menu
private STexture GetTextureValue(string _string)
{
return _Base.Theme.GetSkinTexture(_string, _PartyModeID);
return CBase.Base.Theme.GetSkinTexture(_string, _PartyModeID);
}
private SColorF GetColorValue(string _string)
{
return _Base.Theme.GetColor(_string, _PartyModeID);
return CBase.Base.Theme.GetColor(_string, _PartyModeID);
}
#endregion Private