shithub: choc

Info  •  Files  •  Log  •  Branches

Two Strife bugs knocked out:
* R_ExecuteSetViewSize must use centery, not viewheight, or you get to
  see a nice infinite horizon if you resize the screen while looking at
  the floor or ceiling.
* Finally fixed status bar flickering problem when resizing the screen -
  Rogue reordered some code in D_Display - HUD and ST_DrawExternal are
  done *after* the border redraws.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2496

--- a/src/strife/d_main.c

+++ b/src/strife/d_main.c

@@ -294,18 +294,6 @@

     if (gamestate == GS_LEVEL && !automapactive && gametic)

         R_RenderPlayerView (&players[displayplayer]);

-    if (gamestate == GS_LEVEL && gametic)

-    {

-        HU_Drawer ();

-        if(ST_DrawExternal()) 

-            popupactivestate = true;

-        else if(popupactivestate)

-        {

-            popupactivestate = false;

-            menuactivestate = 1;

-        }

-    }

-

     // clean up border stuff

     if (gamestate != oldgamestate && gamestate != GS_LEVEL)

         I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));

@@ -344,6 +332,19 @@

     viewactivestate = viewactive;

     inhelpscreensstate = inhelpscreens;

     oldgamestate = wipegamestate = gamestate;

+

+    // haleyjd 20120208: [STRIFE] Rogue moved this down to below border drawing

+    if (gamestate == GS_LEVEL && gametic)

+    {

+        HU_Drawer ();

+        if(ST_DrawExternal()) 

+            popupactivestate = true;

+        else if(popupactivestate)

+        {

+            popupactivestate = false;

+            menuactivestate = 1;

+        }

+    }

     // draw pause pic

     if (paused)

--- a/src/strife/r_main.c

+++ b/src/strife/r_main.c

@@ -740,7 +740,8 @@

     // planes

     for (i=0 ; i<viewheight ; i++)

     {

-	dy = ((i-viewheight/2)<<FRACBITS)+FRACUNIT/2;

+	//dy = ((i-viewheight/2)<<FRACBITS)+FRACUNIT/2;

+        dy = ((i - centery)<<FRACBITS) + FRACUNIT/2;

 	dy = abs(dy);

 	yslope[i] = FixedDiv ( (viewwidth<<detailshift)/2*FRACUNIT, dy);

     }