Platform cfails fixed! (savegames now store platform momentum)

This commit is contained in:
Louis authored and Ashnal committed 2020-02-17 00:53:29 -05:00
1 parent 0b315a8364
commit 4fb02a2175
4 files changed
+69 -28

No files matched your search

+60 -27
View File
@@ -5237,11 +5237,14 @@ int maxLiveTicOffset;
int minLiveTicOffset;
int smoothingDelay;
int platformHeight[BACKUPTICS];
#define MAXOFFSETHISTORY 35
int ticTimeOffsetHistory[MAXOFFSETHISTORY];
void MakeNetDebugString();
void RefreshNetDetections();
static void PerformDebugRewinds();
boolean FindMatchingTics(int* liveTicOut, int* gameTicOut);
boolean CompareTiccmd(const ticcmd_t* a, const ticcmd_t* b);
@@ -5306,27 +5309,20 @@ void TryRunTics(tic_t realtics)
boolean recordingStates = (gamestate == GS_LEVEL) && leveltime >= 10;
tic_t numNewTics = neededtic - gametic;
static int controlDelay = -1;
boolean preserveSoundDisabled = sound_disabled;
// preserve camera changes
angle_t oldAngle = localangle;
INT32 oldAiming = localaiming;
// preserve camera changes while we play with simulations/rewinds
angle_t preservedAngle = localangle;
INT32 preservedAiming = localaiming;
if (recordingStates && rewindingWow && rewindingTarget > 0)
if (recordingStates)
{
save_p = gameStateBuffer[(gametic - rewindingTarget) % BACKUPTICS];
P_LoadNetGame(true);
for (int i = 0; i < rewindingTarget; i++) {
netcmds[gametic%BACKUPTICS][consoleplayer] = gameTicBuffer[gametic - rewindingTarget + i % BACKUPTICS][consoleplayer];
G_Ticker(true);
}
localaiming = oldAiming;
localangle = oldAngle;
rewindingWow = false;
PerformDebugRewinds();
}
localangle = preservedAngle;
localaiming = preservedAiming;
// record the actual local controls for this frame
liveTic = I_GetTime();
simulatedTicBuffer[liveTic % BACKUPTICS] = localcmds;
@@ -5341,11 +5337,12 @@ void TryRunTics(tic_t realtics)
// Load the real state if it exists
if (canSimulate) {
if (gameStateBufferIsValid[gametic % BACKUPTICS]) {
save_p = gameStateBuffer[gametic % BACKUPTICS];
sound_disabled = true;
gametic--;
save_p = gameStateBuffer[gametic % BACKUPTICS];
P_LoadNetGame(true);
gametic++;
sound_disabled = preserveSoundDisabled;
}
}
@@ -5394,6 +5391,8 @@ void TryRunTics(tic_t realtics)
int numToSimulate = 0;
boolean enableSmoothing = true;
sound_disabled = true;
// run the simulated state
// find the latest available real state
// sometimes we will go backwards to buffer the updates
@@ -5422,12 +5421,12 @@ void TryRunTics(tic_t realtics)
for (int j = 0; j < MAXPLAYERS; j++) {
if (playeringame[j] && j != consoleplayer) {
// just use their last control for now
netcmds[gametic % BACKUPTICS][j] = netcmds[(min(smoothedTic + i + 1, gametic) - 1 + BACKUPTICS) % BACKUPTICS][j];
netcmds[gametic % BACKUPTICS][j] = gameTicBuffer[(min(smoothedTic + i, gametic) + BACKUPTICS) % BACKUPTICS][j];
}
}
// control self
netcmds[gametic % BACKUPTICS][consoleplayer] = simulatedTicBuffer[(liveTic - estimatedRTT + i + BACKUPTICS + 1) % BACKUPTICS];
netcmds[gametic % BACKUPTICS][consoleplayer] = simulatedTicBuffer[(liveTic - estimatedRTT + i + 1 + BACKUPTICS) % BACKUPTICS];
G_Ticker(true); // tic a bunch of times lol see what happens lolol
}
@@ -5435,8 +5434,10 @@ void TryRunTics(tic_t realtics)
rendergametic = 0; // hack to make sure game doesn't jitter
// restore local camera stuff because that's local anyways~
localangle = oldAngle;
localaiming = oldAiming;
localangle = preservedAngle;
localaiming = preservedAiming;
sound_disabled = preserveSoundDisabled;
}
if (!recordingStates)
@@ -5486,6 +5487,38 @@ void RefreshNetDetections()
}
}
static void PerformDebugRewinds() {
if (rewindingWow && rewindingTarget > 0)
{
save_p = gameStateBuffer[(gametic - rewindingTarget) % BACKUPTICS];
P_LoadNetGame(true);
for (int i = 0; i < rewindingTarget; i++) {
netcmds[gametic%BACKUPTICS][consoleplayer] = gameTicBuffer[gametic - rewindingTarget + i % BACKUPTICS][consoleplayer];
G_Ticker(true);
}
rewindingWow = false;
}
if (!server && gameStateBufferIsValid[gametic % BACKUPTICS] && cv_debugsimulaterewind.value > 0 && players[consoleplayer].mo) {
/* sector_t initial = *((elevator_t*)thlist[1].next)->sector;
mobj_t initialPlayer = *players[consoleplayer].mo;*/
for (int i = 0; i < cv_debugsimulaterewind.value; i++) {
G_Ticker(true);
}
save_p = gameStateBuffer[gametic % BACKUPTICS];
P_LoadNetGame(true);
/*sector_t current = *((elevator_t*)thlist[1].next)->sector;
mobj_t currentPlayer = *players[consoleplayer].mo;*/
// consistency debug checks go here
}
}
char netDebugText[10000];
void MakeNetDebugString()
@@ -5504,19 +5537,19 @@ void MakeNetDebugString()
if ((tic_t)i >= simTic - gametic) {
// show tics and matches
sprintf(&netDebugText[strlen(netDebugText)],
"srv: %d%slcl: %d%s\n",
"srv: %d%slcl: %d%s %d\n",
gametic - i,
(i == matchingGameTic ? "<" : " "),
liveTic - i,
(i == matchingLiveTic ? "<" : " "));
(i == matchingLiveTic ? "<" : " "), platformHeight[(gametic - i) % BACKUPTICS]);
}
else {
sprintf(&netDebugText[strlen(netDebugText)],
"____ %d_lcl: %d%s\n",
"____ %d_lcl: %d%s %d\n",
simTic,
//(i == matchingGameTic ? "<" : " "),
liveTic - i,
(i == matchingLiveTic ? "<" : " "));
(i == matchingLiveTic ? "<" : " "), platformHeight[gametic % BACKUPTICS]);
}
}
+5 -1
View File
@@ -483,6 +483,9 @@ consvar_t cv_netdelay = { "netdelay", "0", 0, netdelay_cons_t, NULL, 0, NULL, NU
static CV_PossibleValue_t netjitter_cons_t[] = { {0, "MIN"}, {5, "MAX"}, {0, NULL} };
consvar_t cv_netjitter = { "netjitter", "0", 0, netdelay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL };
static CV_PossibleValue_t debugsimulaterewind_cons_t[] = { {0, "MIN"}, {BACKUPTICS - 1, "MAX"}, {0, NULL} };
consvar_t cv_debugsimulaterewind = { "debugsimulaterewind", "0", 0, debugsimulaterewind_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL };
char timedemo_name[256];
boolean timedemo_csv;
char timedemo_csv_id[256];
@@ -644,6 +647,7 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_simulatetics);
CV_RegisterVar(&cv_netdelay);
CV_RegisterVar(&cv_netjitter);
CV_RegisterVar(&cv_debugsimulaterewind);
// for master server connection
AddMServCommands();
@@ -804,7 +808,7 @@ void MemShow() {
sizeu1(Z_TagsUsage(PU_PURGELEVEL, INT32_MAX) >> 10));
}
char buffer[1024 * 768];
static char buffer[1024 * 768];
static void Command_Saveloadtest(void)
{
memleak = true;
+1
View File
@@ -151,6 +151,7 @@ extern consvar_t cv_simulate;
extern consvar_t cv_simulatetics;
extern consvar_t cv_netdelay;
extern consvar_t cv_netjitter;
extern consvar_t cv_debugsimulaterewind;
extern consvar_t cv_skipmapcheck;
+3
View File
@@ -1071,6 +1071,7 @@ typedef enum
#ifdef ESLOPE
, MD2_SLOPE = 1<<11
#endif
MD2_PMOM = 1<<14
} mobj_diff2_t;
typedef enum
@@ -1239,6 +1240,8 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
diff |= MD_DSCALE;
if (mobj->scalespeed != mapobjectscale/12)
diff2 |= MD2_SCALESPEED;
if (mobj->pmomz != 0)
diff2 |= MD2_PMOM;
if (mobj == redflag)
diff |= MD_REDFLAG;