yquake2
/
xatrix
mirror of https://github.com/yquake2/xatrix.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix stupid missmerge, ReadField() may only be called once for a field.

This commit is contained in:
Yamagi Burmeister 2019-02-05 08:56:06 +01:00
parent 39e5a3189d
commit 1d6e3f6eab
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/savegame/savegame.c
View File

@ -719,15 +719,13 @@ ReadClient(FILE *f, gclient_t *client, short save_ver)
for (field = clientfields; field->name; field++) for (field = clientfields; field->name; field++)
{ {
ReadField(f, field, (byte *)client);
if (field->save_ver <= save_ver) if (field->save_ver <= save_ver)
{ {
ReadField(f, field, (byte *)client); ReadField(f, field, (byte *)client);
} }
} }
if(save_ver < 3) if (save_ver < 3)
{ {
InitClientResp(client); InitClientResp(client);
} }

2
src/savegame/tables/gamefunc_decs.h
View File

@ -14,7 +14,7 @@ extern void WriteLevelLocals ( FILE * f ) ;
extern void WriteEdict ( FILE * f , edict_t * ent ) ; extern void WriteEdict ( FILE * f , edict_t * ent ) ;
extern void ReadGame ( const char * filename ) ; extern void ReadGame ( const char * filename ) ;
extern void WriteGame ( const char * filename , qboolean autosave ) ; 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 WriteClient ( FILE * f , gclient_t * client ) ;
extern void ReadField ( FILE * f , field_t * field , byte * base ) ; extern void ReadField ( FILE * f , field_t * field , byte * base ) ;
extern void WriteField2 ( FILE * f , field_t * field , byte * base ) ; extern void WriteField2 ( FILE * f , field_t * field , byte * base ) ;