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

Check for unit on trading block last in load() and lload()

Browse source 
This is to make them more similar, and to get the market code out of
the way.
This commit is contained in:
Markus Armbruster 2009-01-05 10:07:09 +01:00
parent 5cbab82dcf
commit c4c7cac6fe
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,13 +116,6 @@ load(void)
if (!player->owner && (load_unload == UNLOAD)) { if (!player->owner && (load_unload == UNLOAD)) {
continue; continue;
} }
if (opt_MARKET) {
if (ontradingblock(EF_SHIP, &ship)) {
pr("You cannot load/unload an item on the trading block!\n");
continue;
}
}
if (ship.shp_own != player->cnum) { if (ship.shp_own != player->cnum) {
if (!noisy) if (!noisy)
continue; continue;
@ -165,6 +158,14 @@ load(void)
xyas(ship.shp_x, ship.shp_y, player->cnum)); xyas(ship.shp_x, ship.shp_y, player->cnum));
continue; continue;
} }
if (opt_MARKET) {
if (ontradingblock(EF_SHIP, &ship)) {
pr("You cannot load/unload an item on the trading block!\n");
continue;
}
}
switch (type) { switch (type) {
case EF_PLANE: case EF_PLANE:
if (0 != if (0 !=
@ -262,13 +263,6 @@ lload(void)
if (sect.sct_own != player->cnum && land.lnd_own != player->cnum) if (sect.sct_own != player->cnum && land.lnd_own != player->cnum)
continue; continue;
if (opt_MARKET) {
if (ontradingblock(EF_LAND, &land)) {
pr("You cannot load/unload an item on the trading block!\n");
continue;
}
}
if (sect.sct_own != player->cnum && load_unload == LOAD) { if (sect.sct_own != player->cnum && load_unload == LOAD) {
if (noisy) if (noisy)
pr("Sector %s is not yours.\n", pr("Sector %s is not yours.\n",
@ -281,6 +275,14 @@ lload(void)
xyas(land.lnd_x, land.lnd_y, player->cnum)); xyas(land.lnd_x, land.lnd_y, player->cnum));
continue; continue;
} }
if (opt_MARKET) {
if (ontradingblock(EF_LAND, &land)) {
pr("You cannot load/unload an item on the trading block!\n");
continue;
}
}
switch (type) { switch (type) {
case EF_LAND: case EF_LAND:
if (0 != if (0 !=