aboutsummaryrefslogtreecommitdiffstats
path: root/Game
diff options
context:
space:
mode:
authormota23 <mota23@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-15 18:04:42 +0000
committermota23 <mota23@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-15 18:04:42 +0000
commit66f4c5511f1cc61b68e75d874ea6a1dc88f9e75a (patch)
treee7a535830509929640c23aa7b4451ff00e0c9f79 /Game
parent78ddfd6d20e419716dfa5085e01b059d40dd61ed (diff)
downloadusdx-66f4c5511f1cc61b68e75d874ea6a1dc88f9e75a.tar.gz
usdx-66f4c5511f1cc61b68e75d874ea6a1dc88f9e75a.tar.xz
usdx-66f4c5511f1cc61b68e75d874ea6a1dc88f9e75a.zip
Added: Keys 1.2.3 to use Joker in Popup-Party-Menu
Added: 2 sets of Statics for Song-Screen. (need work, just startet) Some Fixes in Deluxe Theme. (missing texts, fixed positions etc.) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@194 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/Classes/UThemes.pas10
-rw-r--r--Game/Code/Screens/UScreenSong.pas26
-rw-r--r--Game/Code/Screens/UScreenSongMenu.pas33
3 files changed, 67 insertions, 2 deletions
diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index b92ef4fb..d3358440 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -293,6 +293,13 @@ type
StaticTeam3Joker3: TThemeStatic;
StaticTeam3Joker4: TThemeStatic;
StaticTeam3Joker5: TThemeStatic;
+
+
+
+ StaticKeys1 : TThemeStatic;
+ TextKeys1 : TThemeText;
+
+
end;
TThemeSing = class(TThemeBasic)
@@ -1002,6 +1009,9 @@ begin
ThemeLoadStatic(Song.StaticTeam3Joker4, 'SongStaticTeam3Joker4');
ThemeLoadStatic(Song.StaticTeam3Joker5, 'SongStaticTeam3Joker5');
+ ThemeLoadStatic(Song.StaticKeys1, 'SongStaticKeys1');
+ ThemeLoadText(Song.TextKeys1, 'SongStaticKeys1Text');
+
// Sing
ThemeLoadBasic(Sing, 'Sing');
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 9fcb7ee8..2ce6b6df 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -52,7 +52,9 @@ type
StaticTeam3Joker3: Cardinal;
StaticTeam3Joker4: Cardinal;
StaticTeam3Joker5: Cardinal;
-
+ StaticKeys1: Cardinal;
+ TextKeys1: integer;
+
constructor Create; override;
procedure SetScroll;
procedure SetScroll1;
@@ -79,7 +81,7 @@ type
//Party Mode
procedure SelectRandomSong;
procedure SetJoker;
-
+ procedure SetStatics;
//procedures for Menu
procedure StartSong;
procedure OpenEditor;
@@ -662,6 +664,10 @@ begin
StaticTeam3Joker4 := AddStatic(Theme.Song.StaticTeam3Joker4);
StaticTeam3Joker5 := AddStatic(Theme.Song.StaticTeam3Joker5);
+ StaticKeys1 := AddStatic(Theme.Song.StaticKeys1);
+
+ TextKeys1 := AddText(Theme.Song.TextKeys1);
+
// Song List
// Songs.LoadSongList; // moved to the UltraStar unit
CatSongs.Refresh;
@@ -1215,6 +1221,7 @@ begin
end;
SetJoker;
+ SetStatics;
end;
procedure TScreenSong.onHide;
@@ -1646,6 +1653,21 @@ begin
end;
end;
+procedure TScreenSong.SetStatics;
+begin
+ //If Party Mode
+ if Mode = 1 then //Use Statics for Party-Song-Selection
+ begin
+ Static[StaticKeys1].Visible := false;
+ Text[TextKeys1].Visible := false;
+ end
+ else //Use regular Statics for Song-Selection
+ begin //Hide all
+ Static[StaticKeys1].Visible := true;
+ Text[TextKeys1].Visible := true;
+ end;
+end;
+
//Procedures for Menu
procedure TScreenSong.StartSong;
diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index 73b38a05..537536bb 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -96,6 +96,39 @@ begin
if (Interaction=3) then
InteractDec;
end;
+
+ SDLK_1:
+ begin //Jocker
+ //Joker spielen
+ case CurMenu of
+ SM_Party_Main:
+ begin
+ ScreenSong.DoJoker(0)
+ end;
+ end;
+ end;
+ SDLK_2:
+ begin //Jocker
+ //Joker spielen
+ case CurMenu of
+ SM_Party_Main:
+ begin
+ ScreenSong.DoJoker(1)
+ end;
+ end;
+ end;
+ SDLK_3:
+ begin //Jocker
+ //Joker spielen
+ case CurMenu of
+ SM_Party_Main:
+ begin
+ ScreenSong.DoJoker(2)
+ end;
+ end;
+ end;
+
+
end;
end;
end;