From eee35f7534d1af2b726a9a2ed61f9b0fc6aa4135 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Fri, 14 Dec 2012 19:08:24 +0100 Subject: [PATCH] moved EGameMode --- Vocaluxe/GameModes/IGameMode.cs | 8 ------- Vocaluxe/Menu/CPlaylist.cs | 3 +-- Vocaluxe/Menu/IMenu.cs | 9 ++++++- Vocaluxe/Menu/SongMenu/CSong.cs | 1 - Vocaluxe/Screens/CScreenSong.cs | 42 ++++++++++++++++----------------- 5 files changed, 30 insertions(+), 33 deletions(-) diff --git a/Vocaluxe/GameModes/IGameMode.cs b/Vocaluxe/GameModes/IGameMode.cs index ec649af5..67c87afb 100644 --- a/Vocaluxe/GameModes/IGameMode.cs +++ b/Vocaluxe/GameModes/IGameMode.cs @@ -8,14 +8,6 @@ using Vocaluxe.Menu.SongMenu; namespace Vocaluxe.GameModes { - public enum EGameMode - { - TR_GAMEMODE_NORMAL, - TR_GAMEMODE_MEDLEY, - TR_GAMEMODE_DUET, - TR_GAMEMODE_SHORTSONG - } - interface IGameMode { void Init(); diff --git a/Vocaluxe/Menu/CPlaylist.cs b/Vocaluxe/Menu/CPlaylist.cs index 76ca8231..7c832056 100644 --- a/Vocaluxe/Menu/CPlaylist.cs +++ b/Vocaluxe/Menu/CPlaylist.cs @@ -7,7 +7,6 @@ using System.Xml.XPath; using System.Windows.Forms; using Vocaluxe.Menu.SongMenu; -using Vocaluxe.GameModes; namespace Vocaluxe.Menu { @@ -1231,7 +1230,7 @@ namespace Vocaluxe.Menu PlaylistElements[i].SelectSlide.Clear(); 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) PlaylistElements[i].SelectSlide.SetSelectionByValueIndex(g); } diff --git a/Vocaluxe/Menu/IMenu.cs b/Vocaluxe/Menu/IMenu.cs index 4fb34d91..c9d909e5 100644 --- a/Vocaluxe/Menu/IMenu.cs +++ b/Vocaluxe/Menu/IMenu.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Text; using System.Windows.Forms; -using Vocaluxe.GameModes; using Vocaluxe.Menu.SingNotes; using Vocaluxe.Menu.SongMenu; @@ -784,4 +783,12 @@ namespace Vocaluxe.Menu public int LineNr; public int ID; } + + public enum EGameMode + { + TR_GAMEMODE_NORMAL, + TR_GAMEMODE_MEDLEY, + TR_GAMEMODE_DUET, + TR_GAMEMODE_SHORTSONG + } } diff --git a/Vocaluxe/Menu/SongMenu/CSong.cs b/Vocaluxe/Menu/SongMenu/CSong.cs index 994b9ee7..1c83f464 100644 --- a/Vocaluxe/Menu/SongMenu/CSong.cs +++ b/Vocaluxe/Menu/SongMenu/CSong.cs @@ -6,7 +6,6 @@ using System.Text.RegularExpressions; using Vocaluxe.Menu; using Vocaluxe.Menu.SingNotes; -using Vocaluxe.GameModes; namespace Vocaluxe.Menu.SongMenu { diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 8b519091..9c535570 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -57,7 +57,7 @@ namespace Vocaluxe.Screens private bool _SongOptionsActive = false; private bool _PlaylistActive = false; - private List _AvailableGameModes; + private List _AvailableGameModes; private ScreenSongOptions _sso; private CStatic DragAndDropCover; @@ -67,7 +67,7 @@ namespace Vocaluxe.Screens public CScreenSong() { - _AvailableGameModes = new List(); + _AvailableGameModes = new List(); } protected override void Init() @@ -656,9 +656,9 @@ namespace Vocaluxe.Screens else { if (CSongs.VisibleSongs[SongNr].IsDuet) - gm = GameModes.EGameMode.TR_GAMEMODE_DUET; + gm = EGameMode.TR_GAMEMODE_DUET; else - gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL; + gm = EGameMode.TR_GAMEMODE_NORMAL; } CGame.Reset(); @@ -676,9 +676,9 @@ namespace Vocaluxe.Screens { EGameMode gm; if (CSongs.VisibleSongs[SongNr].IsDuet) - gm = GameModes.EGameMode.TR_GAMEMODE_DUET; + gm = EGameMode.TR_GAMEMODE_DUET; else - gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL; + gm = EGameMode.TR_GAMEMODE_NORMAL; CGame.Reset(); CGame.ClearSongs(); @@ -695,7 +695,7 @@ namespace Vocaluxe.Screens { EGameMode gm; if (CSongs.VisibleSongs[SongNr].Medley.Source != EMedleySource.None) - gm = GameModes.EGameMode.TR_GAMEMODE_MEDLEY; + gm = EGameMode.TR_GAMEMODE_MEDLEY; else return; @@ -868,20 +868,20 @@ namespace Vocaluxe.Screens SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Clear(); if (!CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet) { - SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_NORMAL)); - _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_NORMAL); - SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_SHORTSONG)); - _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_SHORTSONG); + SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(EGameMode), EGameMode.TR_GAMEMODE_NORMAL)); + _AvailableGameModes.Add(EGameMode.TR_GAMEMODE_NORMAL); + SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(EGameMode), EGameMode.TR_GAMEMODE_SHORTSONG)); + _AvailableGameModes.Add(EGameMode.TR_GAMEMODE_SHORTSONG); } if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet) { - SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_DUET)); - _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_DUET); + SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(EGameMode), EGameMode.TR_GAMEMODE_DUET)); + _AvailableGameModes.Add(EGameMode.TR_GAMEMODE_DUET); } 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)); - _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_MEDLEY); + SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(EGameMode), EGameMode.TR_GAMEMODE_MEDLEY)); + _AvailableGameModes.Add(EGameMode.TR_GAMEMODE_MEDLEY); } //Set SelectSlide-Selection to last selected game-mode if possible for (int i = 0; i < _AvailableGameModes.Count; i++) @@ -1000,9 +1000,9 @@ namespace Vocaluxe.Screens gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection]; else if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet) - gm = GameModes.EGameMode.TR_GAMEMODE_DUET; + gm = EGameMode.TR_GAMEMODE_DUET; else - gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL; + gm = EGameMode.TR_GAMEMODE_NORMAL; //Check if Playlist really exists if (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Selection - 1 >= 0) @@ -1028,9 +1028,9 @@ namespace Vocaluxe.Screens gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection]; else if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet) - gm = GameModes.EGameMode.TR_GAMEMODE_DUET; + gm = EGameMode.TR_GAMEMODE_DUET; else - gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL; + gm = EGameMode.TR_GAMEMODE_NORMAL; //Create new playlist Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist(); @@ -1057,9 +1057,9 @@ namespace Vocaluxe.Screens gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection]; else if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet) - gm = GameModes.EGameMode.TR_GAMEMODE_DUET; + gm = EGameMode.TR_GAMEMODE_DUET; 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); Playlists[htPlaylists(Playlist)].UpdatePlaylist(); Playlists[htPlaylists(Playlist)].ScrollToBottom();