From bd7f987e26bf8d2308f14d219434c25b13d37c6f Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 3 Jun 2010 08:11:58 +0000
Subject: cleanup

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2435 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/menu/UDisplay.pas | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/menu/UDisplay.pas b/src/menu/UDisplay.pas
index ed66836d..fbe469a5 100644
--- a/src/menu/UDisplay.pas
+++ b/src/menu/UDisplay.pas
@@ -51,7 +51,7 @@ type
       ePreDraw: THookableEvent;
       eDraw: THookableEvent;
 
-      //fade-to-black-hack
+      // fade-to-black
       BlackScreen:   boolean;
 
       FadeEnabled:   boolean;  // true if fading is enabled
@@ -87,7 +87,7 @@ type
       NextScreen:          PMenu;
       CurrentScreen:       PMenu;
 
-      //popup data
+      // popup data
       NextScreenWithCheck: Pmenu;
       CheckOK:             boolean;
 
@@ -160,13 +160,13 @@ begin
   ePreDraw := THookableEvent.Create('Display.PreDraw');
   eDraw := THookableEvent.Create('Display.Draw');
 
-  //popup hack
+  // init popup
   CheckOK             := false;
   NextScreen          := nil;
   NextScreenWithCheck := nil;
   BlackScreen         := false;
 
-  // fade mod
+  // init fade
   FadeStartTime := 0;
   FadeEnabled := (Ini.ScreenFade = 1);
   FadeFailed  := false;
@@ -175,7 +175,7 @@ begin
   glGenTextures(2, PGLuint(@FadeTex));
   InitFadeTextures();
 
-  //Set LastError for OSD to No Error
+  // set LastError for OSD to No Error
   OSD_LastError := 'No Errors';
 
   // software cursor default values
@@ -281,7 +281,7 @@ begin
       
       if (FadeEnabled and not FadeFailed) then
       begin
-        //Create Fading texture if we're just starting
+        // create fading texture if we're just starting
         if FadeStartTime = 0 then
         begin
           // draw screen that will be faded
@@ -313,7 +313,6 @@ begin
             Log.LogError('Fading disabled: ' + gluErrorString(glError), 'TDisplay.Draw');
           end;
 
-          // blackscreen-hack
           if not BlackScreen and (S = 1) and not DoneOnShow then
           begin
             NextScreen.OnShow;
@@ -326,7 +325,6 @@ begin
             FadeStartTime := SDL_GetTicks;
         end; // end texture creation in first fading step
 
-        // blackscreen-hack
         if not BlackScreen then
         begin
           ePreDraw.CallHookChain(false);
@@ -335,6 +333,7 @@ begin
         end
         else if ScreenAct = 1 then
         begin
+          // draw black screen
           glClearColor(0, 0, 0, 1);
           glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
         end;
@@ -378,8 +377,8 @@ begin
           //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
         end;
       end
-      
-      // blackscreen hack
+
+      // there is no need to init next screen if it is a black screen
       else if not BlackScreen then
       begin
         NextScreen.OnShow;
-- 
cgit v1.2.3