- fixed merge error.

This commit is contained in:
Christoph Oelckers 2019-11-26 19:15:44 +01:00
parent 1b0a036995
commit 7cbe9615ea

View file

@ -73,8 +73,6 @@ short besttarget;
short nViewLeft; short nViewLeft;
short bCamera = kFalse; short bCamera = kFalse;
int gFov;
short nViewy; short nViewy;
int viewz; int viewz;
@ -511,7 +509,7 @@ void DrawView(int smoothRatio)
static uint8_t sectorCeilingPal[MAXSECTORS]; static uint8_t sectorCeilingPal[MAXSECTORS];
static uint8_t wallPal[MAXWALLS]; static uint8_t wallPal[MAXWALLS];
int const viewingRange = viewingrange; int const viewingRange = viewingrange;
int const vr = Blrintf(65536.f * tanf(gFov * (fPI / 360.f))); int const vr = Blrintf(65536.f * tanf(r_fov * (fPI / 360.f)));
if (r_usenewaspect) if (r_usenewaspect)
{ {