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

(ITEM_MAX): New, value 9999.

Browse source 
(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
Download patch file Download diff file Expand all files Collapse all files

15
src/lib/update/nav_util.c
View file

@ -84,8 +84,8 @@ check_nav(struct sctstr *sect)
int
load_it(register struct shpstr *sp, register struct sctstr *psect, int i)
{
int comm, shipown, amount, ship_amt, sect_amt,
abs_max, max_amt, transfer;
int comm, shipown, amount, ship_amt, sect_amt;
int abs_max, max_amt, transfer;
s_char item;
struct mchrstr *vship;
@ -107,8 +107,8 @@ load_it(register struct shpstr *sp, register struct sctstr *psect, int i)
if (comm == V_CIVIL || comm == V_MILIT)
sect_amt--; /* leave 1 civ or mil to hold the sector. */
vship = &mchr[(int)sp->shp_type];
abs_max = max_amt = (vl_find(comm, vship->m_vtype,
vship->m_vamt, (int)vship->m_nv));
abs_max = max_amt = vl_find(comm, vship->m_vtype,
vship->m_vamt, (int)vship->m_nv);
if (!abs_max)
return 0; /* can't load the ship, skip to the end. */
@ -168,7 +168,6 @@ unload_it(register struct shpstr *sp)
int comm;
int sect_amt;
int ship_amt;
int abs_max = 99999; /* max amount a sector can hold. */
int max_amt;
int level;
@ -204,11 +203,7 @@ unload_it(register struct shpstr *sp)
if (comm == V_CIVIL)
ship_amt--; /* This leaves 1 civs on board the ship */
if (sect_amt >= abs_max)
continue; /* The sector is full. */
max_amt = min(ship_amt, abs_max - sect_amt);
max_amt = min(ship_amt, ITEM_MAX - sect_amt);
if (max_amt <= 0)
continue;