From 2478e4959f08b82e9a3baa949d6fcf0833948a98 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 18 Apr 2011 18:11:28 +0000
Subject: 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
---
 Game/Code/Screens/UScreenSongMenu.pas | 39 +++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

(limited to 'Game/Code/Screens/UScreenSongMenu.pas')

diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index e209a176..98e8a49c 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -26,6 +26,7 @@ const
   SM_Main = 1;
 
   SM_Song = 8 or 1;
+  SM_Song_Play = 8 or 2;
 
   SM_Medley = 16 or 1;
 
@@ -359,6 +360,22 @@ begin
         Button[3].Text[0].Text := Language.Translate('SONG_MENU_EDIT');
       end;
 
+    SM_Song_Play:
+      begin
+        ID := 'ID_032';
+        CurMenu := sMenu;
+        Text[0].Text := Language.Translate('SONG_MENU_PLAY');
+
+        Button[0].Visible := True;
+        Button[1].Visible := not CatSongs.Song[ScreenSong.Interaction].isDuet;
+        Button[2].Visible := False;
+        Button[3].Visible := False;
+        SelectsS[0].Visible := False;
+
+        Button[0].Text[0].Text := Language.Translate('SONG_MENU_PLAY');
+        Button[1].Text[0].Text := Language.Translate('SONG_MENU_PLAY_TOGETHER');
+      end;
+
     SM_Medley:
       begin
         ID := 'ID_032';
@@ -629,8 +646,7 @@ begin
         Case Interaction of
           0: //Button 1
             begin
-              ScreenSong.StartSong;
-              Visible := False;
+              MenuShow(SM_Song_Play);
             end;
 
           1: //Button 2
@@ -659,6 +675,25 @@ begin
         end;
       end;
 
+    SM_Song_Play:
+      begin
+        Case Interaction of
+          0: //Button 1
+            begin
+              ScreenSong.StartSong;
+              Visible := False;
+            end;
+
+          1: //Button 2
+            begin
+              //Select New Players then Sing:
+              ScreenSong.SingTogether := true;
+              ScreenSong.StartSong;
+              Visible := False;
+            end;
+        end;
+      end;
+
     SM_Medley:
       begin
         Case Interaction of
-- 
cgit v1.2.3