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

Simplify load() and lload()

Browse source 
Also make them more similar.  No functional change.
This commit is contained in:
Markus Armbruster 2009-01-05 15:22:13 +01:00
parent 2e6f971b6c
commit 17ad9fc5f2
1 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,33 +113,33 @@ load(void)
while (nxtitem(&nbst, &ship)) { while (nxtitem(&nbst, &ship)) {
if (!ship.shp_own) if (!ship.shp_own)
continue; continue;
if (!player->owner && (load_unload == UNLOAD)) {
continue;
}
if (!player->owner) { if (!player->owner) {
if (!noisy) if (load_unload == UNLOAD || !noisy)
continue; continue;
if (getrel(getnatp(ship.shp_own), player->cnum) < FRIENDLY) if (getrel(getnatp(ship.shp_own), player->cnum) < FRIENDLY)
continue; continue;
} }
if (!getsect(ship.shp_x, ship.shp_y, &sect)) /* XXX */ if (!getsect(ship.shp_x, ship.shp_y, &sect)) /* XXX */
continue; continue;
if (!player->owner && ship.shp_own != player->cnum)
continue;
if (!player->owner && !sect_has_dock(&sect))
continue;
if (!sect.sct_own) if (!sect.sct_own)
continue; continue;
if (!player->owner && load_unload == LOAD) { if (!player->owner) {
if (noisy) if (ship.shp_own != player->cnum)
pr("You don't own %s \n", continue;
xyas(ship.shp_x, ship.shp_y, player->cnum)); if (!sect_has_dock(&sect))
continue; continue;
if (load_unload == LOAD) {
if (noisy)
pr("You don't own %s \n",
xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;
}
} }
if (!sect_has_dock(&sect)) { if (!sect_has_dock(&sect)) {
if (noisy) if (noisy)
pr("Sector %s is not a harbor or canal.\n", pr("Sector %s is not a harbor or canal.\n",
xyas(ship.shp_x, ship.shp_y, player->cnum)); xyas(sect.sct_x, sect.sct_y, player->cnum));
continue; continue;
} }
if (!player->owner && load_unload == UNLOAD if (!player->owner && load_unload == UNLOAD
@ -153,7 +153,7 @@ load(void)
if (noisy) if (noisy)
pr("The %s at %s is not 2%% efficient yet.\n", pr("The %s at %s is not 2%% efficient yet.\n",
dchr[sect.sct_type].d_name, dchr[sect.sct_type].d_name,
xyas(ship.shp_x, ship.shp_y, player->cnum)); xyas(sect.sct_x, sect.sct_y, player->cnum));
continue; continue;
} }
@ -247,10 +247,8 @@ lload(void)
while (nxtitem(&nbst, &land)) { while (nxtitem(&nbst, &land)) {
if (land.lnd_own == 0) if (land.lnd_own == 0)
continue; continue;
if (!player->owner && load_unload == UNLOAD)
continue;
if (!player->owner) { if (!player->owner) {
if (!noisy) if (load_unload == UNLOAD || !noisy)
continue; continue;
if (getrel(getnatp(land.lnd_own), player->cnum) != ALLIED) if (getrel(getnatp(land.lnd_own), player->cnum) != ALLIED)
continue; continue;
@ -258,19 +256,20 @@ lload(void)
if (!getsect(land.lnd_x, land.lnd_y, &sect)) /* XXX */ if (!getsect(land.lnd_x, land.lnd_y, &sect)) /* XXX */
continue; continue;
if (!player->owner && land.lnd_own != player->cnum) if (!player->owner) {
continue; if (land.lnd_own != player->cnum)
if (!player->owner && load_unload == LOAD) { continue;
if (noisy) if (load_unload == LOAD) {
if (noisy)
pr("Sector %s is not yours.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;
}
if (getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) {
pr("Sector %s is not yours.\n", pr("Sector %s is not yours.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum)); xyas(sect.sct_x, sect.sct_y, player->cnum));
continue; continue;
} }
if (!player->owner &&
getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) {
pr("Sector %s is not yours.\n",
xyas(land.lnd_x, land.lnd_y, player->cnum));
continue;
} }
if (opt_MARKET) { if (opt_MARKET) {