From 1d6e3f6eabf8f08c5dc4e1ef33d4d3c11a3b6bf1 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Tue, 5 Feb 2019 08:56:06 +0100 Subject: [PATCH] Fix stupid missmerge, ReadField() may only be called once for a field. --- src/savegame/savegame.c | 4 +--- src/savegame/tables/gamefunc_decs.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/savegame/savegame.c b/src/savegame/savegame.c index 03069e7..221e134 100644 --- a/src/savegame/savegame.c +++ b/src/savegame/savegame.c @@ -719,15 +719,13 @@ ReadClient(FILE *f, gclient_t *client, short save_ver) for (field = clientfields; field->name; field++) { - ReadField(f, field, (byte *)client); - if (field->save_ver <= save_ver) { ReadField(f, field, (byte *)client); } } - if(save_ver < 3) + if (save_ver < 3) { InitClientResp(client); } diff --git a/src/savegame/tables/gamefunc_decs.h b/src/savegame/tables/gamefunc_decs.h index 1d3b8ce..9c6ab2a 100644 --- a/src/savegame/tables/gamefunc_decs.h +++ b/src/savegame/tables/gamefunc_decs.h @@ -14,7 +14,7 @@ extern void WriteLevelLocals ( FILE * f ) ; extern void WriteEdict ( FILE * f , edict_t * ent ) ; extern void ReadGame ( const char * filename ) ; extern void WriteGame ( const char * filename , qboolean autosave ) ; -extern void ReadClient ( FILE * f , gclient_t * client, short save_ver ) ; +extern void ReadClient ( FILE * f , gclient_t * client , short save_ver ) ; extern void WriteClient ( FILE * f , gclient_t * client ) ; extern void ReadField ( FILE * f , field_t * field , byte * base ) ; extern void WriteField2 ( FILE * f , field_t * field , byte * base ) ;