Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #225 from badgerman/develop 

bug 2057: fixing sea serpents with empty names, again.
This commit is contained in:
Enno Rehling 2015-06-12 18:08:32 +02:00
parent 6306ed754b 272653f8ba
commit 4fa3f81baa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kernel/save.c
View File

@ -618,13 +618,13 @@ unit *read_unit(struct gamedata *data)
} }
READ_STR(data->store, obuf, sizeof(obuf)); READ_STR(data->store, obuf, sizeof(obuf));
u->_name = _strdup(obuf); u->_name = obuf[0] ? _strdup(obuf) : 0;
if (lomem) { if (lomem) {
READ_STR(data->store, NULL, 0); READ_STR(data->store, NULL, 0);
} }
else { else {
READ_STR(data->store, obuf, sizeof(obuf)); READ_STR(data->store, obuf, sizeof(obuf));
u->display = _strdup(obuf); u->display = obuf[0] ? _strdup(obuf) : 0;
} }
READ_INT(data->store, &number); READ_INT(data->store, &number);
set_number(u, number); set_number(u, number);