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

Revert "general check for sf->faction's validity" 

This reverts commit f18b5ea7d2.
This commit is contained in:
Philipp Dreher 2015-11-01 21:40:06 +01:00
parent f18b5ea7d2
commit 491e5faed9
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kernel/save.c
View File

@ -1346,16 +1346,11 @@ void writefaction(struct gamedata *data, const faction * f)
WRITE_SECTION(data->store);
for (sf = f->allies; sf; sf = sf->next) {
if (sf->faction != NULL) {
int no = sf->faction->no;
int status = alliedfaction(NULL, f, sf->faction, HELP_ALL);
if (status != 0) {
WRITE_INT(data->store, no);
WRITE_INT(data->store, sf->status);
}
}
else {
log_error("NULL-pointer in ally-struct for faction '%s'.", f->no);
int no = (sf->faction != NULL) ? sf->faction->no : 0;
int status = alliedfaction(NULL, f, sf->faction, HELP_ALL);
if (status != 0) {
WRITE_INT(data->store, no);
WRITE_INT(data->store, sf->status);
}
}
WRITE_INT(data->store, 0);