aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2016-01-03 18:53:48 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2016-01-03 18:53:48 +0000
commit7d635777630569ca23f051ae8f5a4950aa6cca91 (patch)
treef4c866b1f20dcca2f6703325e2fd87faccc3aa36 /src
parent5339826adf02204f8e3721578207aa2ad38e38c8 (diff)
downloadusdx-7d635777630569ca23f051ae8f5a4950aa6cca91.tar.gz
usdx-7d635777630569ca23f051ae8f5a4950aa6cca91.tar.xz
usdx-7d635777630569ca23f051ae8f5a4950aa6cca91.zip
prepare for adding some screens
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3175 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
-rw-r--r--src/menu/UDisplay.pas15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/menu/UDisplay.pas b/src/menu/UDisplay.pas
index 3b1c32f2..60b7055f 100644
--- a/src/menu/UDisplay.pas
+++ b/src/menu/UDisplay.pas
@@ -215,7 +215,7 @@ begin
for i := 0 to 1 do
begin
glBindTexture(GL_TEXTURE_2D, FadeTex[i]);
- //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, 3, TexW, TexH, 0, GL_RGB, GL_UNSIGNED_BYTE, nil);
end;
@@ -270,7 +270,16 @@ begin
else if (ScreenPopupInfo <> nil) and ScreenPopupInfo.Visible then
ScreenPopupInfo.Draw
else if (ScreenPopupCheck <> nil) and ScreenPopupCheck.Visible then
- ScreenPopupCheck.Draw;
+ ScreenPopupCheck.Draw
+{ add as needed
+ else if (ScreenPopupInsertUser <> nil) and ScreenPopupInsertUser.Visible then
+ ScreenPopupInsertUser.Draw
+ else if (ScreenPopupSendScore <> nil) and ScreenPopupSendScore.Visible then
+ ScreenPopupSendScore.Draw
+ else if (ScreenPopupScoreDownload <> nil) and ScreenPopupScoreDownload.Visible then
+ ScreenPopupScoreDownload.Draw
+}
+ ;
// fade
FadeStartTime := 0;
@@ -536,7 +545,7 @@ begin
Cursor_LastMove := Ticks;
Cursor_Fade := true;
end;
-
+
// fading
if Cursor_Fade then
begin