Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added skip-function. Press CTRL + S or go to pause-menu.

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-07-12 15:08:32 +02:00
1 parent 435a205f57
commit bc9d1882cf
6 files changed
+97 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/Deutsch.xml
+1
View File
@@ -135,6 +135,7 @@
<TR_SCREENSING_PAUSE>Pause</TR_SCREENSING_PAUSE>
<TR_SCREENSING_BUTTON_CANCEL>Lied beenden</TR_SCREENSING_BUTTON_CANCEL>
<TR_SCREENSING_BUTTON_CONTINUE>Fortfahren</TR_SCREENSING_BUTTON_CONTINUE>
<TR_SCREENSING_BUTTON_SKIP>Lied überspringen</TR_SCREENSING_BUTTON_SKIP>
<!--ScreenScore-->
<TR_SCREENSCORE_SCORES>Auswertung</TR_SCREENSCORE_SCORES>
<TR_SCREENSCORE_RATING>Bewertung</TR_SCREENSCORE_RATING>
Output/Languages/English.xml
+1
View File
@@ -135,6 +135,7 @@
<TR_SCREENSING_PAUSE>Pause</TR_SCREENSING_PAUSE>
<TR_SCREENSING_BUTTON_CANCEL>Stop singing</TR_SCREENSING_BUTTON_CANCEL>
<TR_SCREENSING_BUTTON_CONTINUE>Continue</TR_SCREENSING_BUTTON_CONTINUE>
<TR_SCREENSING_BUTTON_SKIP>Skip this song</TR_SCREENSING_BUTTON_SKIP>
<!--ScreenScore-->
<TR_SCREENSCORE_SCORES>Scores</TR_SCREENSCORE_SCORES>
<TR_SCREENSCORE_RATING>Rating</TR_SCREENSCORE_RATING>
Output/Themes/Ambient/Screens/ScreenSing.xml
+61 -4
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ScreenSing>
<ScreenVersion>4</ScreenVersion>
<ScreenVersion>5</ScreenVersion>
<Background1>
<!--<Type>: Background type: None, Color, Texture, Video-->
<Type>None</Type>
@@ -2333,7 +2333,7 @@
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>670</X>
<X>775</X>
<Y>300</Y>
<Z>-2,11</Z>
<W>150</W>
@@ -2390,7 +2390,7 @@
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>460</X>
<X>355</X>
<Y>300</Y>
<Z>-2,11</Z>
<W>150</W>
@@ -2441,6 +2441,63 @@
<Height>26</Height>
</SReflection>
</ButtonContinue>
<ButtonSkip>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>565</X>
<Y>300</Y>
<Z>-2,11</Z>
<W>150</W>
<H>50</H>
<!--<Color>: Button color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonColor</Color>
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonSColor</SColor>
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonTextColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<Text>TR_SCREENSING_BUTTON_SKIP</Text>
</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
<Reflection>
<Space>10</Space>
<Height>26</Height>
</Reflection>
<!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
<SReflection>
<Space>10</Space>
<Height>26</Height>
</SReflection>
</ButtonSkip>
<LyricMain>
<!--<X>, <Y>, <Z>, <W>, <H>: Lyric position, width and height-->
<X>637</X>
@@ -2656,4 +2713,4 @@
</BarPositions>
</SingBars>
</ScreenSing>
</root>
</root>
Output/Themes/Changelog/Changelog_ScreenSing.txt
+6
View File
@@ -1,5 +1,11 @@
ScreenSing
++++++++++
Version 5:
Add:
<ButtonSkip>
++++++++++
Version 4:
Added Elements for 6-player-singing!
Vocaluxe/Base/CGame.cs
+5
View File
@@ -190,6 +190,11 @@ namespace Vocaluxe.Base
return _GameMode.GetPoints();
}
public static int NumRounds
{
get { return _GameMode.GetNumSongs(); }
}
public static int NumPlayer
{
get { return _NumPlayer; }
Vocaluxe/Screens/CScreenSing.cs
+23 -4
View File
@@ -17,7 +17,7 @@ namespace Vocaluxe.Screens
class CScreenSing : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
const int ScreenVersion = 4;
const int ScreenVersion = 5;
struct TimeRect
{
@@ -51,6 +51,7 @@ namespace Vocaluxe.Screens
private const string ButtonCancel = "ButtonCancel";
private const string ButtonContinue = "ButtonContinue";
private const string ButtonSkip = "ButtonSkip";
private const string LyricMain = "LyricMain";
private const string LyricSub = "LyricSub";
@@ -127,6 +128,7 @@ namespace Vocaluxe.Screens
List<string> buttons = new List<string>();
buttons.Add(ButtonCancel);
buttons.Add(ButtonContinue);
buttons.Add(ButtonSkip);
_ThemeButtons = buttons.ToArray();
_ThemeLyrics = new string[] { LyricMain, LyricSub, LyricMainDuet, LyricSubDuet, LyricMainTop, LyricSubTop };
@@ -200,12 +202,21 @@ namespace Vocaluxe.Screens
SetVisuability();
break;
case Keys.S:
if(CGame.NumRounds > CGame.RoundNr)
if(KeyEvent.ModCTRL)
LoadNextSong();
break;
case Keys.Enter:
if (Buttons[htButtons(ButtonContinue)].Selected && _Pause)
TogglePause();
TogglePause();
if (Buttons[htButtons(ButtonCancel)].Selected && _Pause)
Stop();
Stop();
if (Buttons[htButtons(ButtonSkip)].Selected && _Pause)
{
LoadNextSong();
}
break;
}
}
@@ -232,6 +243,11 @@ namespace Vocaluxe.Screens
if (Buttons[htButtons(ButtonCancel)].Selected && _Pause)
Stop();
if (Buttons[htButtons(ButtonSkip)].Selected && _Pause)
{
LoadNextSong();
TogglePause();
}
}
@@ -708,11 +724,14 @@ namespace Vocaluxe.Screens
{
Buttons[htButtons(ButtonCancel)].Visible = true;
Buttons[htButtons(ButtonContinue)].Visible = true;
if (CGame.NumRounds > CGame.RoundNr)
Buttons[htButtons(ButtonSkip)].Visible = true;
CSound.Pause(_CurrentStream);
}else
{
Buttons[htButtons(ButtonCancel)].Visible = false;
Buttons[htButtons(ButtonContinue)].Visible = false;
Buttons[htButtons(ButtonSkip)].Visible = false;
CSound.Play(_CurrentStream);
}
}