aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Menu
diff options
context:
space:
mode:
authorb1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-03 15:34:36 +0000
committerb1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-03 15:34:36 +0000
commitc7db744c1dcbafb38f25a5cb005219faf16134b8 (patch)
tree8ab3b34d886c19778553e98c4402e13336997485 /Game/Code/Menu
parent7ddd1afb9bec5dca80a272a50ea02f6c3cfbc2b7 (diff)
downloadusdx-c7db744c1dcbafb38f25a5cb005219faf16134b8.tar.gz
usdx-c7db744c1dcbafb38f25a5cb005219faf16134b8.tar.xz
usdx-c7db744c1dcbafb38f25a5cb005219faf16134b8.zip
minor changes to PopUp code and to related parts of themes
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@160 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Menu')
-rw-r--r--Game/Code/Menu/UDisplay.pas6
1 files changed, 3 insertions, 3 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;