mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-14 08:50:53 +00:00
Merge branch 'quakefpsfix' into 'next'
Fix quake epicenter calculation for first person and awayviewmobjs Closes #1296 See merge request STJr/SRB2!2522
This commit is contained in:
commit
085e2d66fd
1 changed files with 8 additions and 2 deletions
10
src/r_main.c
10
src/r_main.c
|
@ -1152,8 +1152,14 @@ void R_SetupFrame(player_t *player)
|
|||
|
||||
if (quake.epicenter) {
|
||||
// Calculate 3D distance from epicenter, using the camera.
|
||||
fixed_t xydist = R_PointToDist2(thiscam->x, thiscam->y, quake.epicenter->x, quake.epicenter->y);
|
||||
fixed_t dist = R_PointToDist2(0, thiscam->z, xydist, quake.epicenter->z);
|
||||
fixed_t xydist, dist;
|
||||
if (P_MobjWasRemoved(r_viewmobj)) {
|
||||
xydist = R_PointToDist2(thiscam->x, thiscam->y, quake.epicenter->x, quake.epicenter->y);
|
||||
dist = R_PointToDist2(0, thiscam->z, xydist, quake.epicenter->z);
|
||||
} else {
|
||||
xydist = R_PointToDist2(r_viewmobj->x, r_viewmobj->y, quake.epicenter->x, quake.epicenter->y);
|
||||
dist = R_PointToDist2(0, r_viewmobj->z, xydist, quake.epicenter->z);
|
||||
}
|
||||
|
||||
// More effect closer to epicenter, outside of radius = no effect
|
||||
if (!quake.radius || dist > quake.radius)
|
||||
|
|
Loading…
Reference in a new issue