Merge branch 'Saturn-Next' into absolutehell

This commit is contained in:
Alug committed 2024-08-03 20:48:37 +02:00
commit e9f2ef1422
2 files changed
+4 -4

No files matched your search

+3 -3
View File
@@ -3995,7 +3995,7 @@ boolean P_SpectatorJoinGame(player_t *player)
// Pressing fire assigns you to a team that needs players if allowed.
// Partial code reproduction from p_tick.c autobalance code.
else if (G_GametypeHasTeams())
{
{
INT32 changeto = 0;
INT32 z, numplayersred = 0, numplayersblue = 0;
@@ -4048,11 +4048,11 @@ boolean P_SpectatorJoinGame(player_t *player)
}
// Joining in game from firing.
else
{
{
if (player->mo)
{
P_RemoveMobj(player->mo);
P_SetTarget(&player->mo, NULL);
player->mo = NULL;
}
player->spectator = false;
player->pflags &= ~PF_WANTSTOJOIN;
+1 -1
View File
@@ -80,7 +80,7 @@ subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);
subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y);
#define R_PointToDist(x, y) R_PointToDist2(viewx, viewy, x, y)
#define R_PointToDist2(px2, py2, px1, py1) FixedHypot(px1 - px2, py1 - py2)
#define R_PointToDist2(px2, py2, px1, py1) FixedHypot((px1) - (px2), (py1) - (py2))
boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixed_t bottomh, fixed_t toph);