OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Safeguard against InPlayerFOV being called with no camera.

Browse source
This commit is contained in:
Mari the Deer 2021-06-24 19:20:24 +02:00
commit cfc3c0f7af
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/utility/swwm_utility.zsc
View file

@ -1113,6 +1113,7 @@ Class SWWMUtility
double vfov = p.fov*.5;
double hfov = atan(Screen.GetAspectRatio()*tan(vfov));
let mo = p.camera;
if ( !mo ) return false;
Vector3 pp;
if ( !mo.CheckSight(a,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) return false;
if ( mo is 'PlayerPawn' ) pp = mo.Vec2OffsetZ(0,0,PlayerPawn(mo).player.viewz);
@ -1129,6 +1130,7 @@ Class SWWMUtility
double vfov = p.fov*.5;
double hfov = atan(Screen.GetAspectRatio()*tan(vfov));
let mo = p.camera;
if ( !mo ) return false;
Vector3 pp;
if ( mo is 'PlayerPawn' ) pp = mo.Vec2OffsetZ(0,0,PlayerPawn(mo).player.viewz);
else pp = mo.Vec3Offset(0,0,mo.CameraHeight);