empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

init ef_verify: Don't monkey-patch capability miss, require it

Browse source 
A ship with non-zero nplanes must have capability plane or miss.  When
one doesn't, global_init() silently adds capability miss.

Drop that.  Check for it in ef_verify_config() instead.  Fix up
ship.config accordingly.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-02-21 18:19:39 +01:00
parent c3a26dc899
commit c0c58222bc
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/common/ef_verify.c
View file

@ -329,6 +329,13 @@ verify_ship_chr(void)
symbol_by_value(M_DCH, ship_chr_flags));
retval = -1;
}
if (mchr[i].m_nplanes && !(mchr[i].m_flags & (M_MSL | M_FLY))) {
verify_fail(EF_SHIP_CHR, i, NULL, 0,
"non-zero nplanes needs flag %s or %s",
symbol_by_value(M_FLY, ship_chr_flags),
symbol_by_value(M_MSL, ship_chr_flags));
retval = -1;
}
}
return retval;
}