From cf0475dd94f2ec1df4e953b815807a68d66fc58e Mon Sep 17 00:00:00 2001 From: Louis Date: Sun, 22 Dec 2019 21:54:03 +0000 Subject: [PATCH] Refined steadyplayer delayed rings --- src/d_clisrv.c | 29 ++++++++++++++--------------- src/p_enemy.c | 4 ++-- src/p_mobj.c | 8 ++++++++ src/p_user.c | 2 +- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index bc7e5079f..3938226e7 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -5779,6 +5779,14 @@ static void RunSimulations() player_t* redflagplayer = NULL; player_t* blueflagplayer = NULL; +#define ADJUSTPOSITION(obj, player) do { \ + P_UnsetThingPosition(obj); \ + obj->x += steadyplayers[player].histx[histIndex] - steadyplayers[player].histx[simtic - gametic]; \ + obj->y += steadyplayers[player].histy[histIndex] - steadyplayers[player].histy[simtic - gametic]; \ + obj->z += steadyplayers[player].histz[histIndex] - steadyplayers[player].histz[simtic - gametic]; \ + P_SetThingPosition(obj); \ +} while(0) + for (int i = 0; i < MAXPLAYERS; i++) { if (playeringame[i]) @@ -5788,28 +5796,19 @@ static void RunSimulations() if (players[i].gotflag & GF_BLUEFLAG) blueflagplayer = &players[i]; } + + if (players[i].followmobj) + ADJUSTPOSITION(players[i].followmobj, i); } for (mobj = (mobj_t*)thlist[THINK_MOBJ].next; mobj != (mobj_t*)&thlist[THINK_MOBJ]; mobj = (mobj_t*)mobj->thinker.next) { if (mobj->flags2 & MF2_SHIELD && mobj->target != NULL && mobj->target->player != NULL && mobj->target != players[consoleplayer].mo) - { - mobj->x = steadyplayers[mobj->target->player - players].histx[histIndex]; - mobj->y = steadyplayers[mobj->target->player - players].histy[histIndex]; - mobj->z = steadyplayers[mobj->target->player - players].histz[histIndex]; - } + ADJUSTPOSITION(mobj, mobj->target->player - players); else if (mobj->type == MT_BLUEFLAG && blueflagplayer) - { - mobj->x += steadyplayers[blueflagplayer - players].histx[histIndex] - blueflagplayer->mo->x; - mobj->y += steadyplayers[blueflagplayer - players].histy[histIndex] - blueflagplayer->mo->y; - mobj->z += steadyplayers[blueflagplayer - players].histz[histIndex] - blueflagplayer->mo->z; - } + ADJUSTPOSITION(mobj, blueflagplayer - players); else if (mobj->type == MT_REDFLAG && redflagplayer) - { - mobj->x += steadyplayers[redflagplayer - players].histx[histIndex] - redflagplayer->mo->x; - mobj->y += steadyplayers[redflagplayer - players].histy[histIndex] - redflagplayer->mo->y; - mobj->z += steadyplayers[redflagplayer - players].histz[histIndex] - redflagplayer->mo->z; - } + ADJUSTPOSITION(mobj, redflagplayer - players); } } } diff --git a/src/p_enemy.c b/src/p_enemy.c index 7b80d248e..e49a3baad 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3770,9 +3770,9 @@ void A_ThrownRing(mobj_t *actor) player_t *player; fixed_t dist; - if (cv_netslingdelay.value && issimulation && (tic_t)cv_netsteadyplayers.value > simtic - gametic && actor->target == players[consoleplayer].mo) + if (cv_netslingdelay.value && issimulation && (tic_t)cv_netsteadyplayers.value >= targetsimtic - simtic && actor->target == players[consoleplayer].mo) { - // don't simulate ring weapons if netslingdelay is positive + // don't move ring weapons during simulation if netslingdelay is positive actor->momx = actor->momy = actor->momz = 0; return; } diff --git a/src/p_mobj.c b/src/p_mobj.c index ae06db7c9..e25073010 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12884,6 +12884,7 @@ mobj_t *P_SPMAngle(mobj_t *source, mobjtype_t type, angle_t angle, UINT8 allowai angle_t an; fixed_t x, y, z, slope = 0; + // angle at which you fire, is player angle an = angle; @@ -12900,6 +12901,13 @@ mobj_t *P_SPMAngle(mobj_t *source, mobjtype_t type, angle_t angle, UINT8 allowai th = P_SpawnMobj(x, y, z, type); + if (cv_netslingdelay.value && issimulation && (tic_t)cv_netsteadyplayers.value >= targetsimtic - simtic && source == players[consoleplayer].mo) + { + z = 0x80000000; // don't make rings appear when using netslingdelay + th->flags |= MF_NOTHINK; + th->sprite = SPR_NULL; + } + if (source->eflags & MFE_VERTICALFLIP) th->flags2 |= MF2_OBJECTFLIP; diff --git a/src/p_user.c b/src/p_user.c index 7011168e6..4e22c9e97 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3380,7 +3380,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd) // SRB2kart - unused. { if (mo->flags & MF_MISSILE && mo->flags2 & MF2_RAILRING) { - if (cv_netslingdelay.value && issimulation && (tic_t)cv_netsteadyplayers.value > simtic - gametic && mo->target == players[consoleplayer].mo) + if (cv_netslingdelay.value && issimulation && (tic_t)cv_netsteadyplayers.value >= targetsimtic - simtic && mo->target == players[consoleplayer].mo) // don't fire it yet return;