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

(fuel, load, prod, max_population, shp_nav_one_sector,

Browse source 
nav_loadship, upd_buildeff): Identify BIG_CITY
(IS_BIG_CITY) by using packing type of UPKG instead of
opt_BIG_CITY and sector type of SCT_CAPITAL.
This commit is contained in:
Ron Koenderink 2005-11-14 13:52:12 +00:00
parent d581485d32
commit a2798857cf
8 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ load(void)
continue;
if (!player->owner &&
sect.sct_type != SCT_HARBR &&
(!opt_BIG_CITY || sect.sct_type != SCT_CAPIT))
!IS_BIG_CITY(sect.sct_type))
continue;
if (!sect.sct_own)
continue;
@ -149,11 +149,13 @@ load(void)
continue;
}
if (sect.sct_type != SCT_HARBR &&
(!opt_BIG_CITY || sect.sct_type != SCT_CAPIT)) {
!IS_BIG_CITY(sect.sct_type)) {
if (noisy)
pr("Sector %s is not a harbor%s.\n",
pr("Sector %s is not a harbor%s%s.\n",
xyas(ship.shp_x, ship.shp_y, player->cnum),
opt_BIG_CITY ? " or a city" : "");
IS_BIG_CITY(sect.sct_type) ? " or a " : "",
IS_BIG_CITY(sect.sct_type) ?
dchr[sect.sct_type].d_name : "");
continue;
}
if (sect.sct_own != player->cnum && load_unload == UNLOAD