summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
authorJames Haley2012-02-09 01:54:14 +0000
committerJames Haley2012-02-09 01:54:14 +0000
commit5e30a15fd98148cd9c090465d09ff264c18516c4 (patch)
treed81fb2ed4d0638d94697d7c34c982b5d3038ba4c /src/strife
parent9db0c9c6444dcb2aa4541466caf6b184030683ca (diff)
downloadchocolate-doom-5e30a15fd98148cd9c090465d09ff264c18516c4.tar.gz
chocolate-doom-5e30a15fd98148cd9c090465d09ff264c18516c4.tar.bz2
chocolate-doom-5e30a15fd98148cd9c090465d09ff264c18516c4.zip
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
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/d_main.c25
-rw-r--r--src/strife/r_main.c3
2 files changed, 15 insertions, 13 deletions
diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index f522f332..0b2b1568 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -294,18 +294,6 @@ void D_Display (void)
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));
@@ -345,6 +333,19 @@ void D_Display (void)
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)
{
diff --git a/src/strife/r_main.c b/src/strife/r_main.c
index 0d60b332..6f303773 100644
--- a/src/strife/r_main.c
+++ b/src/strife/r_main.c
@@ -740,7 +740,8 @@ void R_ExecuteSetViewSize (void)
// 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);
}