From a3bc32f7a0abb61587436028c318aef20c682098 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Sat, 20 Aug 2022 13:00:37 -0500
Subject: [PATCH] fix portal interp view positioning
---
src/r_main.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/r_main.c b/src/r_main.c
index 152ed20d9..076605605 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1175,11 +1175,11 @@ static void R_PortalFrame(line_t *start, line_t *dest, portal_pair *portal)
#endif
//R_SetupFrame(player, false);
- newview->x = portal->viewx;
- newview->y = portal->viewy;
- newview->z = portal->viewz;
+ viewx = portal->viewx;
+ viewy = portal->viewy;
+ viewz = portal->viewz;
- newview->angle = portal->viewangle;
+ viewangle = portal->viewangle;
// newview->sin = FINESINE(newview->angle>>ANGLETOFINESHIFT);
// newview->cos = FINECOSINE(newview->angle>>ANGLETOFINESHIFT);
@@ -1207,13 +1207,13 @@ static void R_PortalFrame(line_t *start, line_t *dest, portal_pair *portal)
if (dangle == 0)
#endif
{ // the entrance goes straight opposite the exit, so we just need to mess with the offset.
- newview->x += dest_c.x - start_c.x;
- newview->y += dest_c.y - start_c.y;
+ viewx += dest_c.x - start_c.x;
+ viewy += dest_c.y - start_c.y;
return;
}
#ifdef ANGLED_PORTALS
- newview->angle += dangle;
+ viewangle += dangle;
// newview->sin = FINESINE(newview->angle>>ANGLETOFINESHIFT);
// newview->cos = FINECOSINE(newview->angle>>ANGLETOFINESHIFT);
//CONS_Printf("dangle == %u\n", AngleFixed(dangle)>>FRACBITS);
@@ -1227,8 +1227,8 @@ static void R_PortalFrame(line_t *start, line_t *dest, portal_pair *portal)
angtopoint = R_PointToAngle2(start_c.x, start_c.y, newview->x, newview->y);
angtopoint += dangle;
- newview->x = dest_c.x+FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
- newview->y = dest_c.y+FixedMul(FINESINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
+ viewx = dest_c.x+FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
+ viewy = dest_c.y+FixedMul(FINESINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
}
#endif
}
--
GitLab