aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens/UScreenPartyOptions.pas
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-04-29 17:50:29 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-04-29 17:50:29 +0000
commitbda4fa8e57ca63a1d591433f120b4226d6a5d327 (patch)
tree745df64699fdc0b6e2deafc99107f86166232aa9 /Game/Code/Screens/UScreenPartyOptions.pas
parent23e4d293dc19ce496da33b3929c9b71952148e86 (diff)
downloadusdx-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/UScreenPartyOptions.pas45
1 files changed, 5 insertions, 40 deletions
diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index fd7b5107..f0df9871 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -45,37 +45,6 @@ uses UGraphic, UMain, UIni, UTexture, ULanguage, UParty, UDLLManager, UPlaylist,
function TScreenPartyOptions.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
var
I, J: Integer;
-
- 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
@@ -137,8 +106,8 @@ begin
// Up and Down could be done at the same time,
// but I don't want to declare variables inside
// functions like this one, called so many times
- SDLK_DOWN: SelectNext;
- SDLK_UP: SelectPrev;
+ SDLK_DOWN: InteractNext;
+ SDLK_UP: InteractPrev;
SDLK_RIGHT:
begin
Music.PlayOption;
@@ -193,6 +162,7 @@ begin
SetLength(IPlaylist2, 1);
IPlaylist2[0] := '---';
+ //Clear all Selects
NumTeams := 0;
NumPlayer1 := 0;
NumPlayer2 := 0;
@@ -201,7 +171,8 @@ begin
PlayList := 0;
PlayList2 := 0;
- AddBackground(Theme.PartyOptions.Background.Tex);
+ //Load Screen From Theme
+ LoadFromTheme(Theme.PartyOptions);
SelectLevel := AddSelectSlide (Theme.PartyOptions.SelectLevel, Ini.Difficulty, Theme.ILevel);
SelectPlayList := AddSelectSlide (Theme.PartyOptions.SelectPlayList, PlayList, IPlaylist);
@@ -212,12 +183,6 @@ begin
SelectPlayers2 := AddSelectSlide (Theme.PartyOptions.SelectPlayers2, NumPlayer2, IPlayers);
SelectPlayers3 := AddSelectSlide (Theme.PartyOptions.SelectPlayers3, NumPlayer3, IPlayers);
- for I := 0 to High(Theme.PartyOptions.Static) do
- AddStatic(Theme.PartyOptions.Static[I]);
-
- for I := 0 to High(Theme.PartyOptions.Text) do
- AddText(Theme.PartyOptions.Text[I]);
-
Interaction := 0;
//Hide Team3 Players