stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 22:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Viewrollangle in water

Browse source 
viewrollangle never worked in water, it does now
This commit is contained in:
yellowtd 2017-03-16 01:51:43 -04:00
parent 29161ec1f9
commit 58d02e6f2b
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/p_mobj.c
View file

@ -3526,17 +3526,17 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
dummycam.y = player->awayviewmobj->y; dummycam.y = player->awayviewmobj->y;
dummycam.z = player->awayviewmobj->z; dummycam.z = player->awayviewmobj->z;
dummycam.height = 40*FRACUNIT; // alt view height is 20*FRACUNIT dummycam.height = 40*FRACUNIT; // alt view height is 20*FRACUNIT
// Are we in water? // miru: assign viewroll (awayview)
if (P_CameraCheckWater(&dummycam)) if (P_CheckViewRoll(player))
postimg = postimg_water;
else if (P_CameraCheckHeat(&dummycam))
postimg = postimg_heat;
// miru: assign new postimg on displays
else if (P_CheckViewRoll(player))
{ {
postimg = postimg_roll; postimg = postimg_roll;
postimgparam = player->viewrollangle; postimgparam = player->viewrollangle;
} }
// Are we in water?
else if (P_CameraCheckWater(&dummycam))
postimg = postimg_water;
else if (P_CameraCheckHeat(&dummycam))
postimg = postimg_heat;
else if (P_CheckMotionBlur()) else if (P_CheckMotionBlur())
{ {
postimg = postimg_motion; postimg = postimg_motion;
@ -3548,16 +3548,17 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
} }
else else
{ {
// Are we in water? // miru: assign viewroll
if (P_CameraCheckWater(thiscam)) if (P_CheckViewRoll(player))
postimg = postimg_water;
else if (P_CameraCheckHeat(thiscam))
postimg = postimg_heat;
else if (P_CheckViewRoll(player))
{ {
postimg = postimg_roll; postimg = postimg_roll;
postimgparam = player->viewrollangle; postimgparam = player->viewrollangle;
} }
// Are we in water?
else if (P_CameraCheckWater(thiscam))
postimg = postimg_water;
else if (P_CameraCheckHeat(thiscam))
postimg = postimg_heat;
else if (P_CheckMotionBlur()) else if (P_CheckMotionBlur())
{ {
postimg = postimg_motion; postimg = postimg_motion;