diff options
author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-04-29 17:50:29 +0000 |
---|---|---|
committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-04-29 17:50:29 +0000 |
commit | bda4fa8e57ca63a1d591433f120b4226d6a5d327 (patch) | |
tree | 745df64699fdc0b6e2deafc99107f86166232aa9 /Game/Code/Screens/UScreenSongMenu.pas | |
parent | 23e4d293dc19ce496da33b3929c9b71952148e86 (diff) | |
download | usdx-bda4fa8e57ca63a1d591433f120b4226d6a5d327.tar.gz usdx-bda4fa8e57ca63a1d591433f120b4226d6a5d327.tar.xz usdx-bda4fa8e57ca63a1d591433f120b4226d6a5d327.zip |
Added 2 new Buttons to ScreenMain: Multi and Stats
Updated Language Fiels to Fit with new Buttons
Some CodeClean Up in Menu Class and in Screens
Some minor Bug fixes I forgot about
Added ability to group Buttons within a Screen
New Theme Object:
ButtonCollection:
Same Attributes as a Button Plus
FirstChild: Defining the First Button in the Group.
For Example: SingSolo is 1, SingMulti Button is 2, in ScreenMain
Added Attribute to Theme Button:
Parent: Number of the assigned Group, 0 for no Group
Used new Abilitys in MainScreen
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@149 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | Game/Code/Screens/UScreenSongMenu.pas | 48 |
1 files changed, 8 insertions, 40 deletions
diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas index d4ad8016..fd875527 100644 --- a/Game/Code/Screens/UScreenSongMenu.pas +++ b/Game/Code/Screens/UScreenSongMenu.pas @@ -45,36 +45,6 @@ implementation uses UGraphic, UMain, UIni, UTexture, ULanguage, UParty, UPlaylist;
function TScreenSongMenu.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
- function IsVisible: Boolean;
- begin
- Result := True;
- if (Interactions[Interaction].Typ = 0) then
- begin
- Result := Button[Interactions[Interaction].Num].Visible;
- end
- else if (Interactions[Interaction].Typ = 1) then
- begin
- //Result := Selects[Interactions[Interaction].Num].Visible;
- end
- else if (Interactions[Interaction].Typ = 3) then
- begin
- Result := SelectsS[Interactions[Interaction].Num].Visible;
- end;
- end;
-
- Procedure SelectNext;
- begin
- repeat
- InteractNext;
- until IsVisible;
- end;
-
- Procedure SelectPrev;
- begin
- repeat
- InteractPrev;
- until IsVisible;
- end;
begin
Result := true;
If (PressedDown) Then
@@ -113,8 +83,8 @@ begin HandleReturn;
end;
- SDLK_DOWN: SelectNext;
- SDLK_UP: SelectPrev;
+ SDLK_DOWN: InteractNext;
+ SDLK_UP: InteractPrev;
SDLK_RIGHT:
begin
@@ -141,10 +111,15 @@ var I: integer;
begin
inherited Create;
+
+ //Create Dummy SelectSlide Entrys
SetLength(ISelections, 1);
ISelections[0] := 'Dummy';
- AddBackground(Theme.SongMenu.Background.Tex);
+
+ AddText(Theme.SongMenu.TextMenu);
+
+ LoadFromTheme(Theme.SongMenu);
AddButton(Theme.SongMenu.Button1);
if (Length(Button[0].Text) = 0) then
@@ -164,13 +139,6 @@ begin if (Length(Button[3].Text) = 0) then
AddButtonText(14, 20, 'Button 4');
- AddText(Theme.SongMenu.TextMenu);
-
- for I := 0 to High(Theme.SongMenu.Static) do
- AddStatic(Theme.SongMenu.Static[I]);
-
- for I := 0 to High(Theme.SongMenu.Text) do
- AddText(Theme.SongMenu.Text[I]);
Interaction := 0;
end;
|