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!
This commit is contained in:
1 parent
0644ecd0c3
commit
7fd123d604
7 files changed
+39
-16
No files matched your search
+10
-4
@@ -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++;
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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<<mobj->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);
|
||||
|
||||
@@ -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)
|
||||
|
||||
+9
-4
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user