aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Game/Code/Menu/UDisplay.pas6
-rw-r--r--Game/Code/Screens/UScreenPopup.pas14
-rw-r--r--Languages/English.ini4
-rw-r--r--Languages/German.ini2
-rw-r--r--Skins/Deluxe/Blue.ini1
-rw-r--r--Skins/Deluxe/W&C-Summer.ini1
-rw-r--r--Skins/Deluxe/[menu]PopUpBg.JPGbin0 -> 2012 bytes
-rw-r--r--Skins/Deluxe/x_W&C-Autum.ini1
-rw-r--r--Skins/Deluxe/x_W&C-Winter.ini2
-rw-r--r--Themes/Deluxe.ini78
10 files changed, 35 insertions, 74 deletions
diff --git a/Game/Code/Menu/UDisplay.pas b/Game/Code/Menu/UDisplay.pas
index 428cc6c7..e6c0c4f0 100644
--- a/Game/Code/Menu/UDisplay.pas
+++ b/Game/Code/Menu/UDisplay.pas
@@ -157,7 +157,7 @@ begin
// check if we had an initialization error (canfade=false, dofade=true)
if doFade and not canFade then begin
doFade:=False; //disable fading
- ScreenPopupError.ShowPopup(['Error initializing','fade texture','','fading','disabled']); //show error message
+ ScreenPopupError.ShowPopup('Error initializing\nfade texture\n\nfading\ndisabled'); //show error message
end;
if doFade and canFade then
begin
@@ -169,10 +169,10 @@ begin
ActualScreen.Draw;
glBindTexture(GL_TEXTURE_2D, pTex[S]);
glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, 512, 512, 0);
- if glGetError <> GL_NO_ERROR then
+ if glGetError = GL_NO_ERROR then
begin
canFade := False;
- ScreenPopupError.ShowPopup(['Error copying','fade texture','','fading','disabled']); //show error message
+ ScreenPopupError.ShowPopup('Error copying\nfade texture\nfading\ndisabled'); //show error message
end;
glViewPort((S-1) * ScreenW div Screens, 0, ScreenW div Screens, ScreenH);
NextScreen.onShow;
diff --git a/Game/Code/Screens/UScreenPopup.pas b/Game/Code/Screens/UScreenPopup.pas
index a6e8ccca..019632ff 100644
--- a/Game/Code/Screens/UScreenPopup.pas
+++ b/Game/Code/Screens/UScreenPopup.pas
@@ -7,8 +7,6 @@ uses
type
TScreenPopupCheck = class(TMenu)
- private
- CurMenu: Byte; //Num of the cur. Shown Menu
public
Visible: Boolean; //Whether the Menu should be Drawn
@@ -30,7 +28,7 @@ type
function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;
procedure onShow; override;
procedure onHide; override;
- procedure ShowPopup(msg: array of String);
+ procedure ShowPopup(msg: String);
function Draw: boolean; override;
end;
@@ -220,6 +218,7 @@ begin
SDLK_ESCAPE :
begin
+ Visible:=False;
Result := false;
end;
@@ -280,17 +279,15 @@ end;
procedure TScreenPopupError.onHide;
var i: integer;
begin
- for i:=0 to high(Text) do
- Text[i].Text:='';
end;
-procedure TScreenPopupError.ShowPopup(msg: array of String);
+procedure TScreenPopupError.ShowPopup(msg: String);
var i: integer;
begin
Interaction := 0; //Reset Interaction
Visible := True; //Set Visible
- //dirty hack... Text[0] is invisible for some strange reason
+{ //dirty hack... Text[0] is invisible for some strange reason
for i:=1 to high(Text) do
if i-1 <= high(msg) then
begin
@@ -300,7 +297,8 @@ begin
else
begin
Text[i].Visible:=False;
- end;
+ end;}
+ Text[0].Text:=msg;
Button[0].Visible := True;
diff --git a/Languages/English.ini b/Languages/English.ini
index f9ebaa9c..0562746d 100644
--- a/Languages/English.ini
+++ b/Languages/English.ini
@@ -226,5 +226,5 @@ STAT_DESC_BANDS=Most popular Bands
STAT_DESC_BANDS_REVERSED=Least popular Bands
STAT_FORMAT_BANDS=%0:s \n %1:dx Sung
-MSG_QUIT_USDX=Leave UltraStar?
-MSG_END_PARTY=End Party Mode? \ No newline at end of file
+MSG_QUIT_USDX=Really Leave\n\nUltraStar?
+MSG_END_PARTY=Really End\n\nParty Mode? \ No newline at end of file
diff --git a/Languages/German.ini b/Languages/German.ini
index cced3eec..ee39b3c1 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -255,5 +255,5 @@ STAT_DESC_BANDS=Beliebteste Bands
STAT_DESC_BANDS_REVERSED=Unbeliebteste Bands
STAT_FORMAT_BANDS=%0:s \n Gesungene Songs: %1:d
-MSG_QUIT_USDX=UltraStar verlassen?
+MSG_QUIT_USDX=UltraStar\n\nwirklich\n\nverlassen?
MSG_END_PARTY=Party Modus beenden? \ No newline at end of file
diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini
index bab91903..8717926e 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Skins/Deluxe/Blue.ini
@@ -104,6 +104,7 @@ Leiste2 = [special]bar2.jpg
JumpToBG = [menu]jumpToBg.jpg
SongMenuBG = [menu]songMenuBg.jpg
+PopUpBG = [menu]popUpBG.jpg
# # # N O T E S # # #
diff --git a/Skins/Deluxe/W&C-Summer.ini b/Skins/Deluxe/W&C-Summer.ini
index 4fc5533f..739cd983 100644
--- a/Skins/Deluxe/W&C-Summer.ini
+++ b/Skins/Deluxe/W&C-Summer.ini
@@ -104,6 +104,7 @@ Leiste2 = [special]bar2.jpg
JumpToBG = [menu]jumpToBg.jpg
SongMenuBG = [menu]songMenuBg.jpg
+PopUpBG = [menu]popUpBG.jpg
# # # N O T E S # # #
diff --git a/Skins/Deluxe/[menu]PopUpBg.JPG b/Skins/Deluxe/[menu]PopUpBg.JPG
new file mode 100644
index 00000000..79808600
--- /dev/null
+++ b/Skins/Deluxe/[menu]PopUpBg.JPG
Binary files differ
diff --git a/Skins/Deluxe/x_W&C-Autum.ini b/Skins/Deluxe/x_W&C-Autum.ini
index eba30c44..c3d0e379 100644
--- a/Skins/Deluxe/x_W&C-Autum.ini
+++ b/Skins/Deluxe/x_W&C-Autum.ini
@@ -104,6 +104,7 @@ Leiste2 = [special]bar2.jpg
JumpToBG = [menu]jumpToBg.jpg
SongMenuBG = [menu]songMenuBg.jpg
+PopUpBG = [menu]popUpBG.jpg
# # # N O T E S # # #
diff --git a/Skins/Deluxe/x_W&C-Winter.ini b/Skins/Deluxe/x_W&C-Winter.ini
index e7800aac..ed481e06 100644
--- a/Skins/Deluxe/x_W&C-Winter.ini
+++ b/Skins/Deluxe/x_W&C-Winter.ini
@@ -104,7 +104,7 @@ Leiste2 = [special]bar2.jpg
JumpToBG = [menu]jumpToBg.jpg
SongMenuBG = [menu]songMenuBg.jpg
-
+PopUpBG = [menu]popUpBG.jpg
# # # N O T E S # # #
GrayLeft = [sing]notesLeft.bmp
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 6e4376aa..bc2fbe61 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -6281,13 +6281,13 @@ Texts=1
Statics=1
[CheckPopupButton1]
-X = 294
-Y = 280
+X = 285
+Y = 310
W = 100
H = 25
Tex =Rectangle
-Color =LightBlue
-DColor = DarkBlue
+Color = GrayLight
+DColor = Gray
Type=Font Black
Texts=1
Z = 1
@@ -6304,13 +6304,13 @@ Align=1
Z=1
[CheckPopupButton2]
-X = 426
-Y = 280
+X = 415
+Y = 310
W = 100
H = 25
Tex =Rectangle
-Color =LightBlue
-DColor = DarkBlue
+Color = GrayLight
+DColor = Gray
Type=Font Black
Texts=1
Z = 1
@@ -6328,7 +6328,7 @@ Z=1
[CheckPopupText]
X =400
-Y =125
+Y =165
Color=White
Font =0
Size =14
@@ -6337,9 +6337,9 @@ Align=1
Z=1
[CheckPopupStatic1]
-Tex =SongMenuBG
+Tex =PopUpBG
X =250
-Y =120
+Y =150
W =300
H =200
Z =1
@@ -6353,12 +6353,12 @@ Statics=1
[ErrorPopupButton1]
X = 350
-Y = 280
+Y = 310
W = 100
H = 25
Tex =Rectangle
-Color =LightBlue
-DColor = DarkBlue
+Color = GrayLight
+DColor = Gray
Type=Font Black
Texts=1
Z = 1
@@ -6374,60 +6374,20 @@ Text=OK
Align=1
Z=1
-[ErrorPopupText1]
+[ErrorPopupText]
X =400
-Y =125
+Y =155
Color=White
Font =0
Size =14
-Text=error text line 1
-Align=1
-Z=1
-
-[ErrorPopupText2]
-X =400
-Y =150
-Color=White
-Font =0
-Size =14
-Text=error text line 2
-Align=1
-Z=1
-
-[ErrorPopupText3]
-X =400
-Y =175
-Color=White
-Font =0
-Size =14
-Text=error text line 3
-Align=1
-Z=1
-
-[ErrorPopupText4]
-X =400
-Y =200
-Color=White
-Font =0
-Size =14
-Text=error text line 4
-Align=1
-Z=1
-
-[ErrorPopupText5]
-X =400
-Y =225
-Color=White
-Font =0
-Size =14
-Text=error text line 5
+Text=error text
Align=1
Z=1
[ErrorPopupStatic1]
-Tex =SongMenuBG
+Tex =PopUpBG
X =250
-Y =120
+Y =150
W =300
H =200
Z =0.98
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 19:56:20 +0000