diff options
Diffstat (limited to 'src/strife')
| -rw-r--r-- | src/strife/d_main.c | 25 | ||||
| -rw-r--r-- | src/strife/r_main.c | 3 |
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); } |