fix up merge issues
This commit is contained in:
parent
9aa44fa13b
commit
0efa138cca
2 changed files with 1 additions and 2 deletions
|
|
@ -446,7 +446,7 @@ void HWDrawInfo::CreateScene(bool drawpsprites, FRenderState& state)
|
|||
{
|
||||
double a2 = 20.0 + 0.5*Viewpoint.FieldOfView.Degrees(); // FrustumPitch for vertical clipping
|
||||
if (a2 > 179.0) a2 = 179.0;
|
||||
double pitchmult = !!(portalState.PlaneMirrorFlag & 1) ? -1.0 : 1.0;
|
||||
double pitchmult = !!(drawctx->portalState.PlaneMirrorFlag & 1) ? -1.0 : 1.0;
|
||||
vClipper->SafeAddClipRangeDegPitches(pitchmult * vp.HWAngles.Pitch.Degrees() - a2, pitchmult * vp.HWAngles.Pitch.Degrees() + a2); // clip the suplex range
|
||||
Viewpoint.PitchSin *= pitchmult;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
#include "hw_renderstate.h"
|
||||
#include "texturemanager.h"
|
||||
#include "hw_flatdispatcher.h"
|
||||
#include "hw_viewpointbuffer.h"
|
||||
|
||||
EXTERN_CVAR(Bool, lm_dynlights);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue