aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-02-22 15:59:35 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-02-22 15:59:35 +0000
commitc710a7b0d52b408b865e82eb55480146cbbbaed7 (patch)
tree976715925866bb95a3daebfa6259f0d9cd3abe4b /src
parentc9ab30c9dc3839727066be7a8fc53c068f6d5170 (diff)
downloadusdx-c710a7b0d52b408b865e82eb55480146cbbbaed7.tar.gz
usdx-c710a7b0d52b408b865e82eb55480146cbbbaed7.tar.xz
usdx-c710a7b0d52b408b865e82eb55480146cbbbaed7.zip
completly remove unused UScreenWelcome
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2138 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/base/UGraphic.pas4
-rw-r--r--src/screens/UScreenWelcome.pas164
-rw-r--r--src/ultrastardx.dpr1
3 files changed, 0 insertions, 169 deletions
diff --git a/src/base/UGraphic.pas b/src/base/UGraphic.pas
index 784e5493..45befc46 100644
--- a/src/base/UGraphic.pas
+++ b/src/base/UGraphic.pas
@@ -45,7 +45,6 @@ uses
UImage,
UMusic,
UScreenLoading,
- UScreenWelcome,
UScreenMain,
UScreenName,
UScreenLevel,
@@ -107,7 +106,6 @@ var
ScreenX: integer;
ScreenLoading: TScreenLoading;
- ScreenWelcome: TScreenWelcome;
ScreenMain: TScreenMain;
ScreenName: TScreenName;
ScreenLevel: TScreenLevel;
@@ -704,8 +702,6 @@ begin
SwapBuffers;
}
Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Loading', 3); Log.BenchmarkStart(3);
-{ ScreenWelcome := TScreenWelcome.Create; //'BG', 4, 3);
- Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Welcome', 3); Log.BenchmarkStart(3);}
ScreenMain := TScreenMain.Create;
Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Main', 3); Log.BenchmarkStart(3);
ScreenName := TScreenName.Create;
diff --git a/src/screens/UScreenWelcome.pas b/src/screens/UScreenWelcome.pas
deleted file mode 100644
index 4b463613..00000000
--- a/src/screens/UScreenWelcome.pas
+++ /dev/null
@@ -1,164 +0,0 @@
-{* UltraStar Deluxe - Karaoke Game
- *
- * UltraStar Deluxe is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *}
-
-unit UScreenWelcome;
-
-interface
-
-{$IFDEF FPC}
- {$MODE Delphi}
-{$ENDIF}
-
-{$I switches.inc}
-
-uses
- UMenu,
- SDL,
- SysUtils,
- UThemes;
-
-type
- TScreenWelcome = class(TMenu)
- public
- Animation: real;
- Fadeout: boolean;
- constructor Create; override;
- function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
- function Draw: boolean; override;
- procedure OnShow; override;
- end;
-
-implementation
-
-uses
- UGraphic,
- UTime,
- USkins,
- UTexture;
-
-function TScreenWelcome.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
-begin
- Result := true;
- if (PressedDown) then
- begin
- case PressedKey of
- SDLK_ESCAPE,
- SDLK_BACKSPACE :
- begin
- Result := false;
- end;
- SDLK_RETURN:
- begin
- FadeTo(@ScreenMain);
- Fadeout := true;
- end;
- end;
- end;
-end;
-
-constructor TScreenWelcome.Create;
-begin
- inherited Create;
- AddStatic(-10, -10, 0, 0, 1, 1, 1, Skin.GetTextureFileName('ButtonAlt'), TEXTURE_TYPE_TRANSPARENT);
- AddStatic(-500, 440, 200, 5, 0, 0, 0, Skin.GetTextureFileName('Rectangle'), TEXTURE_TYPE_COLORIZED);
- AddStatic(-500, 472, 200, 5, 0, 0, 0, Skin.GetTextureFileName('Rectangle'), TEXTURE_TYPE_COLORIZED);
- AddStatic(-500, 504, 200, 5, 0, 0, 0, Skin.GetTextureFileName('Rectangle'), TEXTURE_TYPE_COLORIZED);
- AddStatic(-500, 536, 200, 5, 0, 0, 0, Skin.GetTextureFileName('Rectangle'), TEXTURE_TYPE_COLORIZED);
- AddStatic(-500, 568, 200, 5, 0, 0, 0, Skin.GetTextureFileName('Rectangle'), TEXTURE_TYPE_COLORIZED);
- Animation := 0;
- Fadeout := false;
-end;
-
-procedure TScreenWelcome.OnShow;
-begin
- inherited;
-
- CountSkipTimeSet;
-end;
-
-function TScreenWelcome.Draw: boolean;
-var
- Min: real;
- Max: real;
- Factor: real;
- Count: integer;
-begin
- // star animation
- Animation := Animation + TimeSkip*1000;
-
- // draw nothing
- Min := 0; Max := 1000;
- if (Animation >= Min) and (Animation < Max) then
- begin
- end;
-
- // popup
- Min := 1000; Max := 1120;
- if (Animation >= Min) and (Animation < Max) then
- begin
- Factor := (Animation - Min) / (Max - Min);
- Static[0].Texture.X := 600;
- Static[0].Texture.Y := 600 - Factor * 230;
- Static[0].Texture.W := 200;
- Static[0].Texture.H := Factor * 230;
- end;
-
- // bounce
- Min := 1120; Max := 1200;
- if (Animation >= Min) and (Animation < Max) then
- begin
- Factor := (Animation - Min) / (Max - Min);
- Static[0].Texture.Y := 370 + Factor * 50;
- Static[0].Texture.H := 230 - Factor * 50;
- end;
-
- // run
- Min := 1500; Max := 3500;
- if (Animation >= Min) and (Animation < Max) then
- begin
- Factor := (Animation - Min) / (Max - Min);
-
- Static[0].Texture.X := 600 - Factor * 1400;
- Static[0].Texture.H := 180;
-
- for Count := 1 to 5 do
- begin
- Static[Count].Texture.X := 770 - Factor * 1400;
- Static[Count].Texture.W := 150 + Factor * 200;
- Static[Count].Texture.Alpha := Factor * 0.5;
- end;
- end;
-
- Min := 3500;
- if (Animation >= Min) and (not Fadeout) then
- begin
- FadeTo(@ScreenMain);
- Fadeout := true;
- end;
-
- Result := inherited Draw;
-end;
-
-end.
diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr
index 76ff995f..fe434142 100644
--- a/src/ultrastardx.dpr
+++ b/src/ultrastardx.dpr
@@ -302,7 +302,6 @@ uses
//Includes - Screens
//------------------------------
UScreenLoading in 'screens\UScreenLoading.pas',
- UScreenWelcome in 'screens\UScreenWelcome.pas',
UScreenMain in 'screens\UScreenMain.pas',
UScreenName in 'screens\UScreenName.pas',
UScreenLevel in 'screens\UScreenLevel.pas',