zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/rheit/zdoom

This commit is contained in:
Rachael Alexanderson 2016-11-02 03:12:21 -04:00
parent 1b7d21790d f8641c0ffb
commit 7cba67ad45
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/r_main.cpp
View File

@ -361,7 +361,7 @@ void R_SWRSetWindow(int windowSize, int fullWidth, int fullHeight, int stHeight,
MaxVisForWall = (InvZtoScale * (SCREENWIDTH*r_Yaspect) /
(viewwidth*SCREENHEIGHT * FocalTangent));
MaxVisForWall = 32767.0 / MaxVisForWall;
MaxVisForFloor = 32767.0 / (viewheight * FocalLengthY / 160);
MaxVisForFloor = 32767.0 / (viewheight >> 2) * FocalLengthY / 160;
// Reset r_*Visibility vars
R_SetVisibility(R_GetVisibility());

1
src/win32/fb_d3d9.cpp
View File

@ -1094,6 +1094,7 @@ void D3DFB::Update ()
DrawRateStuff();
DrawPackedTextures(d3d_showpacks);
EndBatch(); // Make sure all batched primitives are drawn.
In2D = 0;
Flip();
}
In2D = 0;