aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens/UScreenSong.pas
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2011-04-18 18:11:28 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2011-04-18 18:11:28 +0000
commit2478e4959f08b82e9a3baa949d6fcf0833948a98 (patch)
tree508c10a3a3f3b19102b04fc4e3d0506acac00f01 /Game/Code/Screens/UScreenSong.pas
parenta5a50b95ad673170c0087ca58a4d2b70e874f599 (diff)
downloadusdx-2478e4959f08b82e9a3baa949d6fcf0833948a98.tar.gz
usdx-2478e4959f08b82e9a3baa949d6fcf0833948a98.tar.xz
usdx-2478e4959f08b82e9a3baa949d6fcf0833948a98.zip
added new sing mode: sing together (mean points over all players)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2823 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens/UScreenSong.pas')
-rw-r--r--Game/Code/Screens/UScreenSong.pas16
1 files changed, 13 insertions, 3 deletions
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index aa3c2bf9..aab46786 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -119,7 +119,8 @@ type
PartyPlayed: array of integer; //played in Party Classic
MedleyPlayed: array of integer; //played in Challenge or Classic Medley-mode
- SungToEnd: boolean; //Song was sung to the end?
+ SungToEnd: boolean; //Song was sung to the end?
+ SingTogether: boolean; //Calc mean score
//party Statics (Joker)
StaticTeam1Joker1: Cardinal;
@@ -774,8 +775,16 @@ begin
CatSongs.Selected := Interaction;
//Do the Action that is specified in Ini
case Ini.OnSongClick of
- 0: StartSong;
- 1: SelectPlayers;
+ 0: begin
+ if (SDL_ModState = KMOD_LCTRL) then
+ SingTogether := true;
+ StartSong;
+ end;
+ 1: begin
+ if (SDL_ModState = KMOD_LCTRL) then
+ SingTogether := true;
+ SelectPlayers;
+ end;
2:begin
if (TargetVidVis = full) then
begin
@@ -2024,6 +2033,7 @@ begin
FadeOut := false;
SungToEnd := false;
+ SingTogether := false;
if Mode = smMedley then
Mode := smNormal;