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

Fixes

Browse source
This commit is contained in:
Jaime Ita Passos 2021-04-08 21:47:36 -03:00
parent 7fdcba5014
commit 025aa2a097
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_mobj.c
View file

@ -3697,11 +3697,16 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
// clip movement // clip movement
if (thiscam->z <= thiscam->floorz) // hit the floor if (thiscam->z <= thiscam->floorz) // hit the floor
{ {
fixed_t cam_height = cv_cam_height.value; fixed_t cam_height;
thiscam->z = thiscam->floorz; thiscam->z = thiscam->floorz;
if (player == &players[secondarydisplayplayer]) if (thiscam->scanner.height)
cam_height = (*thiscam->scanner.height);
else if (player == &players[secondarydisplayplayer])
cam_height = cv_cam2_height.value; cam_height = cv_cam2_height.value;
else
cam_height = cv_cam_height.value;
if (thiscam->z > player->mo->z + player->mo->height + FixedMul(cam_height*FRACUNIT + 16*FRACUNIT, player->mo->scale)) if (thiscam->z > player->mo->z + player->mo->height + FixedMul(cam_height*FRACUNIT + 16*FRACUNIT, player->mo->scale))
{ {
if (!resetcalled) if (!resetcalled)

19
src/p_user.c
View file

@ -9831,7 +9831,9 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
focusangle = localangle2; focusangle = localangle2;
else else
focusangle = mo->angle; focusangle = mo->angle;
if (thiscam == &camera) if (thiscam->scanner.rotate)
camrotate = (*thiscam->scanner.rotate);
else if (thiscam == &camera)
camrotate = cv_cam_rotate.value; camrotate = cv_cam_rotate.value;
else if (thiscam == &camera2) else if (thiscam == &camera2)
camrotate = cv_cam2_rotate.value; camrotate = cv_cam2_rotate.value;
@ -9886,8 +9888,8 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
camstill = (!stricmp(cv_cam_still.defaultvalue, "off")) ? false : true; camstill = (!stricmp(cv_cam_still.defaultvalue, "off")) ? false : true;
camorbit = (!stricmp(cv_cam_orbit.defaultvalue, "off")) ? false : true; camorbit = (!stricmp(cv_cam_orbit.defaultvalue, "off")) ? false : true;
camrotate = atoi(cv_cam_rotate.defaultvalue); camrotate = atoi(cv_cam_rotate.defaultvalue);
camdist = FixedMul((INT32)(atof(cv_cam_dist.defaultvalue) * FRACUNIT), mo->scale); camdist = (INT32)(atof(cv_cam_dist.defaultvalue) * FRACUNIT);
camheight = FixedMul((INT32)(atof(cv_cam_height.defaultvalue) * FRACUNIT), mo->scale); camheight = (INT32)(atof(cv_cam_height.defaultvalue) * FRACUNIT);
} }
else if (thiscam == &camera) else if (thiscam == &camera)
{ {
@ -9895,8 +9897,8 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
camstill = cv_cam_still.value; camstill = cv_cam_still.value;
camorbit = cv_cam_orbit.value; camorbit = cv_cam_orbit.value;
camrotate = cv_cam_rotate.value; camrotate = cv_cam_rotate.value;
camdist = FixedMul(cv_cam_dist.value, mo->scale); camdist = cv_cam_dist.value;
camheight = FixedMul(cv_cam_height.value, mo->scale); camheight = cv_cam_height.value;
} }
else // Camera 2 else // Camera 2
{ {
@ -9904,8 +9906,8 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
camstill = cv_cam2_still.value; camstill = cv_cam2_still.value;
camorbit = cv_cam2_orbit.value; camorbit = cv_cam2_orbit.value;
camrotate = cv_cam2_rotate.value; camrotate = cv_cam2_rotate.value;
camdist = FixedMul(cv_cam2_dist.value, mo->scale); camdist = cv_cam2_dist.value;
camheight = FixedMul(cv_cam2_height.value, mo->scale); camheight = cv_cam2_height.value;
} }
if (thiscam->scanner.height) if (thiscam->scanner.height)
@ -9915,6 +9917,9 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (thiscam->scanner.rotate) if (thiscam->scanner.rotate)
camrotate = (*thiscam->scanner.rotate); camrotate = (*thiscam->scanner.rotate);
camdist = FixedMul(camdist, mo->scale);
camheight = FixedMul(camheight, mo->scale);
if (!(twodlevel || (mo->flags2 & MF2_TWOD)) && !(player->powers[pw_carry] == CR_NIGHTSMODE)) if (!(twodlevel || (mo->flags2 & MF2_TWOD)) && !(player->powers[pw_carry] == CR_NIGHTSMODE))
camheight = FixedMul(camheight, player->camerascale); camheight = FixedMul(camheight, player->camerascale);