From cca37e3dfeb5e9362c95d9f431d34db92f35eaaa Mon Sep 17 00:00:00 2001 From: smallmodel <15067410+smallmodel@users.noreply.github.com> Date: Sun, 26 Nov 2023 20:33:07 +0100 Subject: [PATCH] Added and using SAVEGAME_STRUCT_VERSION --- code/qcommon/q_shared.h | 2 ++ code/server/sv_ccmds.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index 61bbb696..a435874b 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -1453,6 +1453,8 @@ typedef struct { // trace->entityNum can also be 0 to (MAX_GENTITIES-1) // or ENTITYNUM_NONE, ENTITYNUM_WORLD +#define SAVEGAME_STRUCT_VERSION 4 + typedef struct { int version; int time; diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c index 05c0c2dd..7f6c74a0 100644 --- a/code/server/sv_ccmds.c +++ b/code/server/sv_ccmds.c @@ -1884,7 +1884,7 @@ qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave) if (f) { FS_Read(&save, sizeof(savegamestruct_t), f); - if (save.version != 4) + if (save.version != SAVEGAME_STRUCT_VERSION) { FS_FCloseFile(f); return qfalse; @@ -1986,7 +1986,7 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave ) SV_SetConfigstring( CS_SAVENAME, "" ); - save.version = 3; + save.version = SAVEGAME_STRUCT_VERSION; save.time = aclock; strncpy( save.mapName, svs.mapName, sizeof( save.mapName ) ); strncpy( save.saveName, svs.gameName, sizeof( save.saveName ) ); @@ -2010,8 +2010,8 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave ) return qfalse; } - FS_Read( &save, sizeof( savegamestruct_t ), f ); - if( save.version != 3 ) + FS_Read(&save, sizeof(savegamestruct_t), f); + if (save.version != SAVEGAME_STRUCT_VERSION) { Com_Printf("Invalid or Old Server SaveGame Version\n"); return qfalse;