zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-30 20:41:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Apply 3dfix2 and 3dfix3 (by hand, again).

Browse source 
SVN r3191 (trunk)
This commit is contained in:
Randy Heit 2011-04-29 03:50:33 +00:00
parent e36dc34d8f
commit 571210fe56
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/d_main.cpp
View file

@ -106,6 +106,7 @@
#include "sc_man.h" #include "sc_man.h"
#include "po_man.h" #include "po_man.h"
#include "resourcefiles/resourcefile.h" #include "resourcefiles/resourcefile.h"
#include "r_3dfloors.h"
EXTERN_CVAR(Bool, hud_althud) EXTERN_CVAR(Bool, hud_althud)
void DrawHUD(); void DrawHUD();
@ -913,6 +914,15 @@ void D_ErrorCleanup ()
menuactive = MENU_Off; menuactive = MENU_Off;
} }
insave = false; insave = false;
fakeActive = 0;
fake3D = 0;
while (CurrentSkybox)
{
R_3D_DeleteHeights();
R_3D_LeaveSkybox();
}
R_3D_ResetClip();
R_3D_DeleteHeights();
} }
//========================================================================== //==========================================================================

10
src/r_segs.cpp
View file

@ -621,6 +621,10 @@ void R_RenderFakeWallRange (drawseg_t *ds, int x1, int x2)
if (!(fake3D & FAKE3D_CLIPBOTTOM)) sclipBottom = floorheight; if (!(fake3D & FAKE3D_CLIPBOTTOM)) sclipBottom = floorheight;
if (!(fake3D & FAKE3D_CLIPTOP)) sclipTop = ceilingheight; if (!(fake3D & FAKE3D_CLIPTOP)) sclipTop = ceilingheight;
// maybe not visible
if (sclipBottom >= frontsector->CenterCeiling()) return;
if (sclipTop <= frontsector->CenterFloor()) return;
if (fake3D & FAKE3D_DOWN2UP) if (fake3D & FAKE3D_DOWN2UP)
{ // bottom to viewz { // bottom to viewz
last = 0; last = 0;
@ -635,7 +639,8 @@ void R_RenderFakeWallRange (drawseg_t *ds, int x1, int x2)
rover->top.plane->a || rover->top.plane->b || rover->top.plane->a || rover->top.plane->b ||
rover->bottom.plane->a || rover->bottom.plane->b || rover->bottom.plane->a || rover->bottom.plane->b ||
rover->top.plane->Zat0() <= sclipBottom || rover->top.plane->Zat0() <= sclipBottom ||
rover->bottom.plane->Zat0() >= ceilingheight) rover->bottom.plane->Zat0() >= ceilingheight ||
rover->top.plane->Zat0() <= floorheight)
{ {
if (!i) if (!i)
{ {
@ -816,7 +821,8 @@ void R_RenderFakeWallRange (drawseg_t *ds, int x1, int x2)
rover->top.plane->a || rover->top.plane->b || rover->top.plane->a || rover->top.plane->b ||
rover->bottom.plane->a || rover->bottom.plane->b || rover->bottom.plane->a || rover->bottom.plane->b ||
rover->bottom.plane->Zat0() >= sclipTop || rover->bottom.plane->Zat0() >= sclipTop ||
rover->top.plane->Zat0() <= floorheight) rover->top.plane->Zat0() <= floorheight ||
rover->bottom.plane->Zat0() >= ceilingheight)
{ {
if ((unsigned)i == backsector->e->XFloor.ffloors.Size() - 1) if ((unsigned)i == backsector->e->XFloor.ffloors.Size() - 1)
{ {