Could sing a medley or short-song now.

This commit is contained in:
Florian Kuepper committed 2012-06-17 18:00:29 +02:00
1 parent 5f00a432e1
commit 8ef112f6b6
4 files changed
+25 -80

No files matched your search

+25 -1
View File
@@ -243,7 +243,31 @@ namespace Vocaluxe.GameModes
{
if (_CurrentSong >= 0 && _CurrentSong < _SongQueque.Count)
{
return CSongs.GetSong(_SongQueque[_CurrentSong].SongID);
CSong song = CSongs.GetSong(_SongQueque[_CurrentSong].SongID);
switch (GetCurrentGameMode())
{
case EGameMode.TR_GAMEMODE_MEDLEY:
// set medley mode timings
song.Start = CGame.GetTimeFromBeats(song.Medley.StartBeat, song.BPM) - song.Medley.FadeInTime + song.Gap;
if (song.Start < 0f)
song.Start = 0f;
song.Finish = CGame.GetTimeFromBeats(song.Medley.EndBeat, song.BPM) + song.Medley.FadeOutTime + song.Gap;
// set lines to medley mode
song.Notes.SetMedley(song.Medley.StartBeat, song.Medley.EndBeat);
break;
case EGameMode.TR_GAMEMODE_SHORTSONG:
song.Finish = CGame.GetTimeFromBeats(song.ShortEnd, song.BPM) + CSettings.DefaultMedleyFadeOutTime + song.Gap;
// set lines to medley mode
song.Notes.SetMedley(song.Notes.GetLines(0).Line[0].FirstNoteBeat, song.ShortEnd);
break;
}
return song;
}
return null;
}
-16
View File
@@ -1,16 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Vocaluxe.GameModes
{
class CGameModeDuet : CGameMode
{
public override void Init()
{
base.Init();
_Initialized = true;
}
}
}
-34
View File
@@ -1,34 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using Vocaluxe.Base;
using Vocaluxe.Lib.Song;
namespace Vocaluxe.GameModes
{
class CGameModeMedley : CGameMode
{
public override void Init()
{
base.Init();
_Initialized = true;
}
protected override void SongManipulation(int SongIndex)
{
CSong song = CSongs.AllSongs[_SongQueque[SongIndex].SongID];
// set medley mode timings
song.Start = CGame.GetTimeFromBeats(song.Medley.StartBeat, song.BPM) - song.Medley.FadeInTime + song.Gap;
if (song.Start < 0f)
song.Start = 0f;
song.Finish = CGame.GetTimeFromBeats(song.Medley.EndBeat, song.BPM) + song.Medley.FadeOutTime + song.Gap;
// set lines to medley mode
song.Notes.SetMedley(song.Medley.StartBeat, song.Medley.EndBeat);
}
}
}
-29
View File
@@ -1,29 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using Vocaluxe.Base;
using Vocaluxe.Lib.Song;
namespace Vocaluxe.GameModes
{
class CGameModeShortSong : CGameMode
{
public override void Init()
{
base.Init();
_Initialized = true;
}
protected override void SongManipulation(int SongIndex)
{
CSong song = CSongs.AllSongs[_SongQueque[SongIndex].SongID];
song.Finish = CGame.GetTimeFromBeats(song.ShortEnd, song.BPM) + CSettings.DefaultMedleyFadeOutTime + song.Gap;
// set lines to medley mode
song.Notes.SetMedley(song.Notes.GetLines(0).Line[0].FirstNoteBeat, song.ShortEnd);
}
}
}