(ITEM_MAX): New, value 9999.

(give, deliver_it): Use it instead of 9990.
(load_comm_ship, load_comm_land, rese): Use it instead of 9999.
(thre): Use it instead of 10000.
(check_market, explore, move, pln_dropoff): Use it instead of 32767.
(unload_it): Use it instead of 99999 (which couldn't possibly work,
but what do you expect from the autonav code).
This commit is contained in:
Markus Armbruster 2004-03-05 06:34:34 +00:00
parent 5ec624514a
commit 95ef2b139d
11 changed files with 27 additions and 31 deletions

View file

@ -333,7 +333,7 @@ check_market(void)
wu(0, comm.com_owner,
"Sale #%d fell through. Goods remain on the market.\n", n);
comm.com_maxbidder = comm.com_owner;
} else if (m + comm.com_amount > 32767) {
} else if (m + comm.com_amount > ITEM_MAX) {
wu(0, comm.com_maxbidder,
"Warehouse full, sale #%d fell though.\n", n);
wu(0, comm.com_owner,

View file

@ -236,8 +236,8 @@ explore(void)
start.sct_flags &= ~MOVE_IN_PROGRESS;
putsect(&start);
amt_dst = sect.sct_item[vtype];
if (32767 - amt_dst < amount) {
amount = 32767 - amt_dst;
if (amount > ITEM_MAX - amt_dst) {
amount = ITEM_MAX - amt_dst;
pr("Only %d can be left there.\n", amount);
if (amount <= 0)
getsect(start.sct_x, start.sct_y, &sect);

View file

@ -72,8 +72,8 @@ give(void)
n = sect.sct_item[ip->i_vtype];
if (amt < 0 && -amt > n) {
m = 0;
} else if (amt > 0 && amt + n > 9990) {
m = 9990;
} else if (amt > 0 && amt + n > ITEM_MAX) {
m = ITEM_MAX;
} else
m = n + amt;
sect.sct_item[ip->i_vtype] = m;

View file

@ -767,8 +767,8 @@ load_comm_ship(struct sctstr *sectp, struct shpstr *sp,
move_amt = -ship_amt;
if (move_amt > sect_amt)
move_amt = sect_amt;
if (move_amt < sect_amt - 9999)
move_amt = sect_amt - 9999;
if (move_amt < sect_amt - ITEM_MAX)
move_amt = sect_amt - ITEM_MAX;
if (!move_amt)
return RET_OK;
if (sectp->sct_oldown != player->cnum && item == V_CIVIL) {
@ -970,8 +970,8 @@ load_comm_land(struct sctstr *sectp, struct lndstr *lp,
move_amt = -land_amt;
if (move_amt > sect_amt)
move_amt = sect_amt;
if (move_amt < sect_amt - 9999)
move_amt = sect_amt - 9999;
if (move_amt < sect_amt - ITEM_MAX)
move_amt = sect_amt - ITEM_MAX;
if (!move_amt)
return RET_OK;
if (sectp->sct_own != player->cnum && move_amt > 0) {

View file

@ -308,8 +308,8 @@ move(void)
}
amt_dst = sect.sct_item[vtype];
if (32767 - amt_dst < amount) {
amount = 32767 - amt_dst;
if (amount > ITEM_MAX - amt_dst) {
amount = ITEM_MAX - amt_dst;
pr("Only room for %d, the rest were lost.\n", amount);
}
if (istest)

View file

@ -122,8 +122,8 @@ rese(void)
sect.sct_y = comm.sell_y;
m = sect.sct_item[ix->i_vtype];
m = m + comm.com_amount;
if (m > 9999)
m = 9999;
if (m > ITEM_MAX)
m = ITEM_MAX;
sect.sct_item[ix->i_vtype] = m;
putsect(&sect);
comm.com_owner = 0;

View file

@ -88,8 +88,8 @@ thre(void)
if (*p == '\0' || *p == '-')
continue;
thresh = atoi(p);
if (thresh > 10000)
thresh = 10000;
if (thresh > ITEM_MAX)
thresh = ITEM_MAX;
if ((val > 0) && (val == thresh)) {
pr("%s threshold unchanged (left at %d)\n",
xyas(nstr.x, nstr.y, player->cnum), val);