moved EGameMode
This commit is contained in:
1 parent
f29c38b500
commit
eee35f7534
5 files changed
+30
-33
No files matched your search
@@ -8,14 +8,6 @@ using Vocaluxe.Menu.SongMenu;
|
|||||||
|
|
||||||
namespace Vocaluxe.GameModes
|
namespace Vocaluxe.GameModes
|
||||||
{
|
{
|
||||||
public enum EGameMode
|
|
||||||
{
|
|
||||||
TR_GAMEMODE_NORMAL,
|
|
||||||
TR_GAMEMODE_MEDLEY,
|
|
||||||
TR_GAMEMODE_DUET,
|
|
||||||
TR_GAMEMODE_SHORTSONG
|
|
||||||
}
|
|
||||||
|
|
||||||
interface IGameMode
|
interface IGameMode
|
||||||
{
|
{
|
||||||
void Init();
|
void Init();
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ using System.Xml.XPath;
|
|||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
|
||||||
using Vocaluxe.Menu.SongMenu;
|
using Vocaluxe.Menu.SongMenu;
|
||||||
using Vocaluxe.GameModes;
|
|
||||||
|
|
||||||
namespace Vocaluxe.Menu
|
namespace Vocaluxe.Menu
|
||||||
{
|
{
|
||||||
@@ -1231,7 +1230,7 @@ namespace Vocaluxe.Menu
|
|||||||
PlaylistElements[i].SelectSlide.Clear();
|
PlaylistElements[i].SelectSlide.Clear();
|
||||||
for (int g = 0; g < pec.Modes.Length; g++)
|
for (int g = 0; g < pec.Modes.Length; g++)
|
||||||
{
|
{
|
||||||
PlaylistElements[i].SelectSlide.AddValue(Enum.GetName(typeof(GameModes.EGameMode), pec.Modes[g]));
|
PlaylistElements[i].SelectSlide.AddValue(Enum.GetName(typeof(EGameMode), pec.Modes[g]));
|
||||||
if (pec.Modes[g] == pec.Mode)
|
if (pec.Modes[g] == pec.Mode)
|
||||||
PlaylistElements[i].SelectSlide.SetSelectionByValueIndex(g);
|
PlaylistElements[i].SelectSlide.SetSelectionByValueIndex(g);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ using System.Drawing;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
|
||||||
using Vocaluxe.GameModes;
|
|
||||||
using Vocaluxe.Menu.SingNotes;
|
using Vocaluxe.Menu.SingNotes;
|
||||||
using Vocaluxe.Menu.SongMenu;
|
using Vocaluxe.Menu.SongMenu;
|
||||||
|
|
||||||
@@ -784,4 +783,12 @@ namespace Vocaluxe.Menu
|
|||||||
public int LineNr;
|
public int LineNr;
|
||||||
public int ID;
|
public int ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum EGameMode
|
||||||
|
{
|
||||||
|
TR_GAMEMODE_NORMAL,
|
||||||
|
TR_GAMEMODE_MEDLEY,
|
||||||
|
TR_GAMEMODE_DUET,
|
||||||
|
TR_GAMEMODE_SHORTSONG
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
|
|||||||
|
|
||||||
using Vocaluxe.Menu;
|
using Vocaluxe.Menu;
|
||||||
using Vocaluxe.Menu.SingNotes;
|
using Vocaluxe.Menu.SingNotes;
|
||||||
using Vocaluxe.GameModes;
|
|
||||||
|
|
||||||
namespace Vocaluxe.Menu.SongMenu
|
namespace Vocaluxe.Menu.SongMenu
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ namespace Vocaluxe.Screens
|
|||||||
|
|
||||||
private bool _SongOptionsActive = false;
|
private bool _SongOptionsActive = false;
|
||||||
private bool _PlaylistActive = false;
|
private bool _PlaylistActive = false;
|
||||||
private List<GameModes.EGameMode> _AvailableGameModes;
|
private List<EGameMode> _AvailableGameModes;
|
||||||
private ScreenSongOptions _sso;
|
private ScreenSongOptions _sso;
|
||||||
|
|
||||||
private CStatic DragAndDropCover;
|
private CStatic DragAndDropCover;
|
||||||
@@ -67,7 +67,7 @@ namespace Vocaluxe.Screens
|
|||||||
|
|
||||||
public CScreenSong()
|
public CScreenSong()
|
||||||
{
|
{
|
||||||
_AvailableGameModes = new List<GameModes.EGameMode>();
|
_AvailableGameModes = new List<EGameMode>();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Init()
|
protected override void Init()
|
||||||
@@ -656,9 +656,9 @@ namespace Vocaluxe.Screens
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (CSongs.VisibleSongs[SongNr].IsDuet)
|
if (CSongs.VisibleSongs[SongNr].IsDuet)
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
gm = EGameMode.TR_GAMEMODE_DUET;
|
||||||
else
|
else
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
CGame.Reset();
|
CGame.Reset();
|
||||||
@@ -676,9 +676,9 @@ namespace Vocaluxe.Screens
|
|||||||
{
|
{
|
||||||
EGameMode gm;
|
EGameMode gm;
|
||||||
if (CSongs.VisibleSongs[SongNr].IsDuet)
|
if (CSongs.VisibleSongs[SongNr].IsDuet)
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
gm = EGameMode.TR_GAMEMODE_DUET;
|
||||||
else
|
else
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
|
|
||||||
CGame.Reset();
|
CGame.Reset();
|
||||||
CGame.ClearSongs();
|
CGame.ClearSongs();
|
||||||
@@ -695,7 +695,7 @@ namespace Vocaluxe.Screens
|
|||||||
{
|
{
|
||||||
EGameMode gm;
|
EGameMode gm;
|
||||||
if (CSongs.VisibleSongs[SongNr].Medley.Source != EMedleySource.None)
|
if (CSongs.VisibleSongs[SongNr].Medley.Source != EMedleySource.None)
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_MEDLEY;
|
gm = EGameMode.TR_GAMEMODE_MEDLEY;
|
||||||
else
|
else
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -868,20 +868,20 @@ namespace Vocaluxe.Screens
|
|||||||
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Clear();
|
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Clear();
|
||||||
if (!CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
if (!CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
||||||
{
|
{
|
||||||
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_NORMAL));
|
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(EGameMode), EGameMode.TR_GAMEMODE_NORMAL));
|
||||||
_AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_NORMAL);
|
_AvailableGameModes.Add(EGameMode.TR_GAMEMODE_NORMAL);
|
||||||
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_SHORTSONG));
|
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(EGameMode), EGameMode.TR_GAMEMODE_SHORTSONG));
|
||||||
_AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_SHORTSONG);
|
_AvailableGameModes.Add(EGameMode.TR_GAMEMODE_SHORTSONG);
|
||||||
}
|
}
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
||||||
{
|
{
|
||||||
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_DUET));
|
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(EGameMode), EGameMode.TR_GAMEMODE_DUET));
|
||||||
_AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_DUET);
|
_AvailableGameModes.Add(EGameMode.TR_GAMEMODE_DUET);
|
||||||
}
|
}
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].Medley.Source != EMedleySource.None)
|
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].Medley.Source != EMedleySource.None)
|
||||||
{
|
{
|
||||||
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_MEDLEY));
|
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(EGameMode), EGameMode.TR_GAMEMODE_MEDLEY));
|
||||||
_AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_MEDLEY);
|
_AvailableGameModes.Add(EGameMode.TR_GAMEMODE_MEDLEY);
|
||||||
}
|
}
|
||||||
//Set SelectSlide-Selection to last selected game-mode if possible
|
//Set SelectSlide-Selection to last selected game-mode if possible
|
||||||
for (int i = 0; i < _AvailableGameModes.Count; i++)
|
for (int i = 0; i < _AvailableGameModes.Count; i++)
|
||||||
@@ -1000,9 +1000,9 @@ namespace Vocaluxe.Screens
|
|||||||
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
||||||
else
|
else
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
gm = EGameMode.TR_GAMEMODE_DUET;
|
||||||
else
|
else
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
|
|
||||||
//Check if Playlist really exists
|
//Check if Playlist really exists
|
||||||
if (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Selection - 1 >= 0)
|
if (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Selection - 1 >= 0)
|
||||||
@@ -1028,9 +1028,9 @@ namespace Vocaluxe.Screens
|
|||||||
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
||||||
else
|
else
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
gm = EGameMode.TR_GAMEMODE_DUET;
|
||||||
else
|
else
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
|
|
||||||
//Create new playlist
|
//Create new playlist
|
||||||
Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist();
|
Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist();
|
||||||
@@ -1057,9 +1057,9 @@ namespace Vocaluxe.Screens
|
|||||||
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
||||||
else
|
else
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
gm = EGameMode.TR_GAMEMODE_DUET;
|
||||||
else
|
else
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].AddSong(CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].ID, gm);
|
CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].AddSong(CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].ID, gm);
|
||||||
Playlists[htPlaylists(Playlist)].UpdatePlaylist();
|
Playlists[htPlaylists(Playlist)].UpdatePlaylist();
|
||||||
Playlists[htPlaylists(Playlist)].ScrollToBottom();
|
Playlists[htPlaylists(Playlist)].ScrollToBottom();
|
||||||
|
|||||||
Reference in new issue
Block a user