From 7fd123d60427f39482f7038bfaf20f486f32c45f Mon Sep 17 00:00:00 2001 From: Louis Date: Sun, 22 Dec 2019 12:13:32 +0000 Subject: [PATCH] Sounds now play instantly (even if they're incorrect) Added ringsling delay for when steadyplayers are enabled The simulation was always one tic behind! OOPS! --- src/d_clisrv.c | 14 ++++++++++---- src/d_netcmd.c | 3 +++ src/d_netcmd.h | 1 + src/p_local.h | 1 + src/p_mobj.c | 15 +++++++++++++++ src/p_saveg.c | 8 -------- src/s_sound.c | 13 +++++++++---- 7 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 328f234bb..e438bf965 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -5439,8 +5439,6 @@ int minLiveTicOffset; int smoothingDelay; UINT64 saveStateBenchmark = 0; UINT64 loadStateBenchmark = 0; -boolean newSaveTic = false; -boolean newLoadTic = false; #define MAXAUTOFUDGERTT 20 @@ -5520,6 +5518,7 @@ void TryRunTics(tic_t realtics) // record the actual local controls boolean recordingStates = (gamestate == GS_LEVEL) && leveltime >= 1 && gametic >= BACKUPTICS; boolean canSimulate = (gamestate == GS_LEVEL) && leveltime >= BACKUPTICS && gametic >= BACKUPTICS && (cv_simulate.value && !server) && !resynch_local_inprogress; + boolean preserveSoundDisabled = sound_disabled; if (simtic > gametic && !canSimulate) { @@ -5534,11 +5533,13 @@ void TryRunTics(tic_t realtics) InvalidateSavestates(); } + if (canSimulate) + sound_disabled = true; + PerformDebugRewinds(); // record the actual local controls for this frame liveTic = I_GetTime(); - newSaveTic = newLoadTic = true; for (tic_t i = 0; i < realtics; i++) localTicBuffer[(liveTic - i) % BACKUPTICS] = localcmds; @@ -5606,7 +5607,10 @@ void TryRunTics(tic_t realtics) // Simulate the game locally if (canSimulate) + { RunSimulations(); + sound_disabled = preserveSoundDisabled; + } // we're gonna need more debugs... MakeNetDebugString(); @@ -5625,7 +5629,7 @@ static void RunSimulations() int tastyFudge = 0; // hack: don't treat duplicate tics as extra round-trip time - for (int j = 0; j < 2; j++) + for (int j = 1; j < 3; j++) { if (CompareTiccmd(&gameTicBuffer[gametic % BACKUPTICS][consoleplayer], &gameTicBuffer[(gametic - j) % BACKUPTICS][consoleplayer])) tastyFudge++; @@ -5679,6 +5683,8 @@ static void RunSimulations() else netcmds[gametic % BACKUPTICS][consoleplayer] = localTicBuffer[(liveTic - estimatedRTT + i + 1 + BACKUPTICS) % BACKUPTICS]; + sound_disabled = (i != numToSimulate - 1); + G_Ticker(true); // tic a bunch of times lol see what happens lolol simtic++; diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 704e23027..3d88c9024 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -501,6 +501,8 @@ consvar_t cv_timefudge = { "timefudge", "0", 0, timefudge_cons_t, NULL, 0, NULL, static CV_PossibleValue_t nettrails_cons_t[] = { {0, "MIN"}, {5, "MAX"}, {0, NULL} }; consvar_t cv_nettrails = { "nettrails", "1", 0, nettrails_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL }; +consvar_t cv_netslingdelay = { "netslingdelay", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL }; + char timedemo_name[256]; boolean timedemo_csv; char timedemo_csv_id[256]; @@ -666,6 +668,7 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_debugsimulaterewind); CV_RegisterVar(&cv_timefudge); CV_RegisterVar(&cv_nettrails); + CV_RegisterVar(&cv_netslingdelay); // for master server connection AddMServCommands(); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index b2c192fd1..fffba87d7 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -158,6 +158,7 @@ extern consvar_t cv_netsteadyplayers; extern consvar_t cv_debugsimulaterewind; extern consvar_t cv_timefudge; extern consvar_t cv_nettrails; +extern consvar_t cv_netslingdelay; extern consvar_t cv_skipmapcheck; diff --git a/src/p_local.h b/src/p_local.h index 3c8395e10..ccb5f8b3d 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -273,6 +273,7 @@ void P_ColorTeamMissile(mobj_t *missile, player_t *source); SINT8 P_MobjFlip(mobj_t *mobj); fixed_t P_GetMobjGravity(mobj_t *mo); FUNCMATH boolean P_WeaponOrPanel(mobjtype_t type); +FUNCMATH boolean P_IsProjectile(mobjtype_t type); boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled); diff --git a/src/p_mobj.c b/src/p_mobj.c index 47a625ac4..759eee0b2 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -397,6 +397,12 @@ boolean P_WeaponOrPanel(mobjtype_t type) return false; } +boolean P_IsProjectile(mobjtype_t type) +{ + return type == MT_THROWNBOUNCE || type == MT_THROWNINFINITY || type == MT_THROWNAUTOMATIC || type == MT_THROWNSCATTER + || type == MT_THROWNEXPLOSION || type == MT_THROWNGRENADE || type == MT_REDRING; +} + // // P_EmeraldManager // @@ -6360,6 +6366,15 @@ void P_MobjThinker(mobj_t *mobj) if (mobj->flags & MF_NOTHINK) return; + if ((mobj->flags & MF_BOSS) && mobj->spawnpoint && (bossdisabled & (1<spawnpoint->extrainfo))) + return; + + if (cv_netslingdelay.value && P_IsProjectile(mobj->type) && issimulation && (tic_t)cv_netsteadyplayers.value > simtic-gametic && mobj->target == players[consoleplayer].mo) + { + // don't simulate ring weapons if netslingdelay is positive + mobj->momx = mobj->momy = mobj->momz = 0; + } + // Remove dead target/tracer. if (mobj->target && P_MobjWasRemoved(mobj->target)) P_SetTarget(&mobj->target, NULL); diff --git a/src/p_saveg.c b/src/p_saveg.c index f79731cf9..88993ef4f 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -4362,14 +4362,6 @@ static inline boolean P_NetUnArchiveMisc(boolean preserveLevel) return true; } - -extern UINT64 saveTime; -extern int numSaves; -extern UINT64 loadTime; -extern int numLoads; -extern boolean newSaveTic; -extern boolean newLoadTic; - UINT64 I_GetTimeUs(void); void P_SaveGame(void) diff --git a/src/s_sound.c b/src/s_sound.c index f1a9d5f3b..936e3ced9 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1236,11 +1236,16 @@ void S_DetachChannelsFromOrigin(void* origin) { if (channels[i].origin == origin) { + // small hack: player-made sounds should stay hearable + if (channels[i].origin != players[displayplayer].mo) + { + channels[i].isdetached = true; + channels[i].detachedx = originmobj->x; + channels[i].detachedy = originmobj->y; + channels[i].detachedz = originmobj->z; + } + channels[i].origin = NULL; - channels[i].isdetached = true; - channels[i].detachedx = originmobj->x; - channels[i].detachedy = originmobj->y; - channels[i].detachedz = originmobj->z; } } }