From 6a700717c32402a18e78757ed8f9d9b690157722 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 9 Dec 2009 16:20:30 +0000
Subject: remove old screen sing modi

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2006 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Lua/src/base/UDraw.pas                | 2 +-
 Lua/src/base/UGraphic.pas             | 8 ++++----
 Lua/src/screens/UScreenPartyScore.pas | 4 ++--
 Lua/src/screens/UScreenPopup.pas      | 4 ++--
 Lua/src/screens/UScreenSong.pas       | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Lua/src/base/UDraw.pas b/Lua/src/base/UDraw.pas
index 50345059..f1bdcad0 100644
--- a/Lua/src/base/UDraw.pas
+++ b/Lua/src/base/UDraw.pas
@@ -926,7 +926,7 @@ begin
   end;
 
   // Draw Lyrics
-  ScreenSingModi.Lyrics.Draw(LyricsState.MidBeat);
+  //ScreenSingModi.Lyrics.Draw(LyricsState.MidBeat);
   // TODO: Lyrics helper
 
   // oscilloscope | the thing that moves when you yell into your mic (imho)
diff --git a/Lua/src/base/UGraphic.pas b/Lua/src/base/UGraphic.pas
index c328d016..99478b70 100644
--- a/Lua/src/base/UGraphic.pas
+++ b/Lua/src/base/UGraphic.pas
@@ -133,7 +133,7 @@ var
   ScreenSongJumpto:     TScreenSongJumpto;
 
   //Party Screens
-  ScreenSingModi:         TScreenSingModi;
+  //ScreenSingModi:         TScreenSingModi;
   ScreenPartyNewRound:    TScreenPartyNewRound;
   ScreenPartyScore:       TScreenPartyScore;
   ScreenPartyWin:         TScreenPartyWin;
@@ -727,8 +727,8 @@ begin
 //  Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Edit Header', 3); Log.BenchmarkStart(3);
   ScreenOpen :=             TScreenOpen.Create;
   Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Open', 3); Log.BenchmarkStart(3);
-  ScreenSingModi :=         TScreenSingModi.Create;
-  Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Sing with Modi support', 3); Log.BenchmarkStart(3);
+  //ScreenSingModi :=         TScreenSingModi.Create;
+  //Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Sing with Modi support', 3); Log.BenchmarkStart(3);
   ScreenSongMenu :=         TScreenSongMenu.Create;
   Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen SongMenu', 3); Log.BenchmarkStart(3);
   ScreenSongJumpto :=         TScreenSongJumpto.Create;
@@ -783,7 +783,7 @@ begin
   ScreenEdit.Destroy;
   ScreenEditConvert.Destroy;
   ScreenOpen.Destroy;
-  ScreenSingModi.Destroy;
+  //ScreenSingModi.Destroy;
   ScreenSongMenu.Destroy;
   ScreenSongJumpto.Destroy;
   ScreenPopupCheck.Destroy;
diff --git a/Lua/src/screens/UScreenPartyScore.pas b/Lua/src/screens/UScreenPartyScore.pas
index 7fc79ee7..eb14a926 100644
--- a/Lua/src/screens/UScreenPartyScore.pas
+++ b/Lua/src/screens/UScreenPartyScore.pas
@@ -304,12 +304,12 @@ end;
 
 procedure TScreenPartyScore.SetAnimationProgress(Progress: real);
 begin
-  if (ScreenSingModi.PlayerInfo.NumPlayers >= 1) then
+  {if (ScreenSingModi.PlayerInfo.NumPlayers >= 1) then
     Static[StaticTeam1].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[0].Percentage / 100;
   if (ScreenSingModi.PlayerInfo.NumPlayers >= 2) then
     Static[StaticTeam2].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[1].Percentage / 100;
   if (ScreenSingModi.PlayerInfo.NumPlayers >= 3) then
-    Static[StaticTeam3].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[2].Percentage / 100;
+    Static[StaticTeam3].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[2].Percentage / 100;}
 end;
 
 end.
diff --git a/Lua/src/screens/UScreenPopup.pas b/Lua/src/screens/UScreenPopup.pas
index bf4752b9..b606c306 100644
--- a/Lua/src/screens/UScreenPopup.pas
+++ b/Lua/src/screens/UScreenPopup.pas
@@ -106,8 +106,8 @@ begin
                begin
                  if (Display.CurrentScreen = @ScreenSing) then
                    ScreenSing.Finish
-                 else if (Display.CurrentScreen = @ScreenSingModi) then
-                   ScreenSingModi.Finish;
+                 {else if (Display.CurrentScreen = @ScreenSingModi) then
+                   ScreenSingModi.Finish;}
                end;
 
                Display.CheckOK:=True;
diff --git a/Lua/src/screens/UScreenSong.pas b/Lua/src/screens/UScreenSong.pas
index 41c98228..1abf5e01 100644
--- a/Lua/src/screens/UScreenSong.pas
+++ b/Lua/src/screens/UScreenSong.pas
@@ -1419,8 +1419,8 @@ begin
     AudioPlayback.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3);
 
   // if hide then stop music (for party mode popup on exit)
-  if (Display.NextScreen <> @ScreenSing) and
-     (Display.NextScreen <> @ScreenSingModi) then
+  if (Display.NextScreen <> @ScreenSing) {and
+     (Display.NextScreen <> @ScreenSingModi) }then
   begin
     StopMusicPreview();
   end;
-- 
cgit v1.2.3