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

Drop could_be_on_ship()'s load count parameters

Browse source 
Just one caller wants them.  Inline that call, and simplify the
others.
This commit is contained in:
Markus Armbruster 2012-06-23 17:10:48 +02:00
parent 665d0d723d
commit 72f1e22b95
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/commands/load.c
View file

@ -30,7 +30,7 @@
* David Sharnoff, 1987
* Ken Stevens, 1995 (rewritten)
* Steve McClure, 1998-2000
* Markus Armbruster, 2004-2011
* Markus Armbruster, 2004-2012
*/
#include <config.h>
@ -461,7 +461,7 @@ load_plane_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
} else if (sp->shp_x != pln.pln_x || sp->shp_y != pln.pln_y)
continue;
if (!could_be_on_ship(&pln, sp, 0, 0, 0, 0)) {
if (!could_be_on_ship(&pln, sp)) {
if (noisy) {
if (plchr[(int)pln.pln_type].pl_flags & P_K)
p = "choppers";