mirror of
https://github.com/yquake2/zaero.git
synced 2024-11-14 00:10:56 +00:00
Fix missmerge, ReadField() may only be called once for each field.
This commit is contained in:
parent
511db03dfc
commit
47010478bc
2 changed files with 1 additions and 5 deletions
|
@ -641,14 +641,12 @@ typedef struct
|
||||||
int ofs;
|
int ofs;
|
||||||
fieldtype_t type;
|
fieldtype_t type;
|
||||||
int flags;
|
int flags;
|
||||||
short save_ver;
|
short save_ver;
|
||||||
} field_t;
|
} field_t;
|
||||||
|
|
||||||
|
|
||||||
extern field_t fields[];
|
extern field_t fields[];
|
||||||
extern gitem_t itemlist[];
|
extern gitem_t itemlist[];
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// g_cmds.c
|
// g_cmds.c
|
||||||
//
|
//
|
||||||
|
|
|
@ -709,8 +709,6 @@ 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);
|
||||||
|
|
Loading…
Reference in a new issue