removed all compile warnings,

fixed skin version loading
This commit is contained in:
Alexander Eckart committed 2012-02-22 16:48:43 +01:00
1 parent 016565df90
commit 2a1eef9bf1
9 files changed
+31 -13

No files matched your search

+1 -1
View File
@@ -338,7 +338,7 @@ namespace Vocaluxe.Base
#endregion private vars #endregion private vars
#region public vars #region public vars
public bool Visible; //public bool Visible;
public float Alpha2 = 1f; public float Alpha2 = 1f;
public float X public float X
+1 -1
View File
@@ -229,7 +229,7 @@ namespace Vocaluxe.Base
public static void UpdatePoints(float Time) public static void UpdatePoints(float Time)
{ {
const bool DEBUG_HIT = false; bool DEBUG_HIT = false;
CSong song = _GameMode.GetSong(); CSong song = _GameMode.GetSong();
+1 -1
View File
@@ -90,7 +90,7 @@ namespace Vocaluxe.Base
public const float LyricHelperMoveTime = 1.5f; public const float LyricHelperMoveTime = 1.5f;
public const float LyricHelperMinTime = 0.2f; public const float LyricHelperMinTime = 0.2f;
public const bool TabNavigation = false; public static bool TabNavigation = false;
public const float BackgroundMusicFadeTime = 0.5f; public const float BackgroundMusicFadeTime = 0.5f;
+4
View File
@@ -482,6 +482,10 @@ namespace Vocaluxe.Base
if (skin.Name != String.Empty) if (skin.Name != String.Empty)
{ {
CHelper.GetValueFromXML("//root/Info/Author", navigator, ref skin.Author, String.Empty); CHelper.GetValueFromXML("//root/Info/Author", navigator, ref skin.Author, String.Empty);
CHelper.TryGetIntValueFromXML("//root/Info/SkinVersionMajor", navigator, ref skin.SkinVersionMajor);
CHelper.TryGetIntValueFromXML("//root/Info/SkinVersionMinor", navigator, ref skin.SkinVersionMinor);
skin.Path = path; skin.Path = path;
skin.FileName = file; skin.FileName = file;
+1 -1
View File
@@ -367,7 +367,7 @@ namespace Vocaluxe.Lib.Draw
{ {
_Device.Present(); _Device.Present();
} }
catch (Direct3D9Exception e) catch (Direct3D9Exception)
{ {
if (_Device.TestCooperativeLevel() == ResultCode.DeviceNotReset) //Do only reset when the device in a resetable state! if (_Device.TestCooperativeLevel() == ResultCode.DeviceNotReset) //Do only reset when the device in a resetable state!
{ {
+14
View File
@@ -232,7 +232,21 @@ namespace Vocaluxe.Menu
public void Draw(float ActualBeat) public void Draw(float ActualBeat)
{ {
if (Visible || CSettings.GameState == EGameState.EditTheme) if (Visible || CSettings.GameState == EGameState.EditTheme)
{
switch (_Style)
{
case ELyricStyle.Fill:
break;
case ELyricStyle.Jump:
break;
case ELyricStyle.Slide:
DrawSlide(ActualBeat); DrawSlide(ActualBeat);
break;
default:
DrawSlide(ActualBeat);
break;
}
}
} }
private void DrawSlide(float CurrentBeat) private void DrawSlide(float CurrentBeat)
+3 -3
View File
@@ -22,9 +22,9 @@ namespace Vocaluxe.Menu.SongMenu
public string ColorName; public string ColorName;
public SThemeSongMenuBook songMenuBook; //public SThemeSongMenuBook songMenuBook;
public SThemeSongMenuDreidel songMenuDreidel; //public SThemeSongMenuDreidel songMenuDreidel;
public SThemeSongMenuList songMenuList; //public SThemeSongMenuList songMenuList;
public SThemeSongMenuTileBoard songMenuTileBoard; public SThemeSongMenuTileBoard songMenuTileBoard;
} }
+5 -5
View File
@@ -23,7 +23,7 @@ namespace Vocaluxe.Screens
const string ButtonProfiles = "ButtonProfiles"; const string ButtonProfiles = "ButtonProfiles";
const string ButtonExit = "ButtonExit"; const string ButtonExit = "ButtonExit";
CParticleEffect Snowflakes; //CParticleEffect Snowflakes;
public CScreenMain() public CScreenMain()
{ {
@@ -114,8 +114,8 @@ namespace Vocaluxe.Screens
{ {
base.OnShow(); base.OnShow();
if (Snowflakes != null) //if (Snowflakes != null)
Snowflakes.Resume(); // Snowflakes.Resume();
} }
public override bool UpdateGame() public override bool UpdateGame()
@@ -145,8 +145,8 @@ namespace Vocaluxe.Screens
{ {
base.OnClose(); base.OnClose();
if (Snowflakes != null) //if (Snowflakes != null)
Snowflakes.Pause(); // Snowflakes.Pause();
} }
} }
} }
+1 -1
View File
@@ -65,7 +65,7 @@ namespace Vocaluxe.Screens
private int _CurrentBeat; private int _CurrentBeat;
private int _CurrentStream = -1; private int _CurrentStream = -1;
private int _NextStream = -1; //private int _NextStream = -1;
private float _Volume = 100f; private float _Volume = 100f;
private int _CurrentVideo = -1; private int _CurrentVideo = -1;
private EAspect _VideoAspect = EAspect.Crop; private EAspect _VideoAspect = EAspect.Crop;