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

(shiprepair, landrepair): Always return 1. Change to return void.

Browse source 
Simplify callers.

(prod_ship, upd_ship, prod_land, upd_land): Move test for mineff.

(upd_land, feed_land): Move food resupply.

(landrepair): Don't putsect(), update code works directly on cache.
This commit is contained in:
Markus Armbruster 2006-05-14 18:23:44 +00:00
parent 851e63ef05
commit 4ae17ff922
2 changed files with 39 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/lib/update/land.c
View file

@ -55,10 +55,8 @@
int mil_dbl_pay; int mil_dbl_pay;
static int landrepair(struct lndstr *, struct natstr *, static void landrepair(struct lndstr *, struct natstr *, int *, int);
int *, int); static void upd_land(struct lndstr *, int, struct natstr *, int *, int);
static void upd_land(struct lndstr *lp, int etus,
struct natstr *np, int *bp, int build);
int int
prod_land(int etus, int natnum, int *bp, int build) prod_land(int etus, int natnum, int *bp, int build)
@ -77,6 +75,12 @@ prod_land(int etus, int natnum, int *bp, int build)
continue; continue;
if (lp->lnd_own != natnum) if (lp->lnd_own != natnum)
continue; continue;
if (lp->lnd_effic < LAND_MINEFF) {
makelost(EF_LAND, lp->lnd_own, lp->lnd_uid,
lp->lnd_x, lp->lnd_y);
lp->lnd_own = 0;
continue;
}
sp = getsectp(lp->lnd_x, lp->lnd_y); sp = getsectp(lp->lnd_x, lp->lnd_y);
if (sp->sct_type == SCT_SANCT) if (sp->sct_type == SCT_SANCT)
@ -128,19 +132,13 @@ upd_land(struct lndstr *lp, int etus,
if (build == 1) { if (build == 1) {
if (np->nat_priorities[PRI_LBUILD] == 0 || np->nat_money < 0) if (np->nat_priorities[PRI_LBUILD] == 0 || np->nat_money < 0)
return; return;
if (lp->lnd_effic < LAND_MINEFF || !landrepair(lp, np, bp, etus)) { landrepair(lp, np, bp, etus);
makelost(EF_LAND, lp->lnd_own, lp->lnd_uid,
lp->lnd_x, lp->lnd_y);
lp->lnd_own = 0;
return;
}
} else { } else {
mult = 1; mult = 1;
if (np->nat_level[NAT_TLEV] < lp->lnd_tech * 0.85) if (np->nat_level[NAT_TLEV] < lp->lnd_tech * 0.85)
mult = 2; mult = 2;
if (lcp->l_flags & L_ENGINEER) if (lcp->l_flags & L_ENGINEER)
mult *= 3; mult *= 3;
/* cost = -(mult * etus * MIN(0.0, money_land * LND_COST(lcp->l_cost, lp->lnd_tech - lcp->l_tech)));*/
cost = -(mult * etus * MIN(0.0, money_land * lcp->l_cost)); cost = -(mult * etus * MIN(0.0, money_land * lcp->l_cost));
if ((np->nat_priorities[PRI_LMAINT] == 0 || np->nat_money < cost) if ((np->nat_priorities[PRI_LMAINT] == 0 || np->nat_money < cost)
&& !player->simulation) { && !player->simulation) {
@ -160,11 +158,8 @@ upd_land(struct lndstr *lp, int etus,
np->nat_money -= cost; np->nat_money -= cost;
} }
/* Grab more stuff */
if ((opt_NOFOOD == 0) && !player->simulation)
resupply_commod(lp, I_FOOD);
if (!player->simulation) { if (!player->simulation) {
/* feed */
if ((n = feed_land(lp, etus, &needed, 1)) > 0) { if ((n = feed_land(lp, etus, &needed, 1)) > 0) {
wu(0, lp->lnd_own, "%d starved in %s%s\n", wu(0, lp->lnd_own, "%d starved in %s%s\n",
n, prland(lp), n, prland(lp),
@ -228,9 +223,8 @@ upd_land(struct lndstr *lp, int etus,
} }
/*ARGSUSED*/ /*ARGSUSED*/
static int static void
landrepair(struct lndstr *land, struct natstr *np, landrepair(struct lndstr *land, struct natstr *np, int *bp, int etus)
int *bp, int etus)
{ {
int delta; int delta;
struct sctstr *sp; struct sctstr *sp;
@ -246,17 +240,17 @@ landrepair(struct lndstr *land, struct natstr *np,
lp = &lchr[(int)land->lnd_type]; lp = &lchr[(int)land->lnd_type];
sp = getsectp(land->lnd_x, land->lnd_y); sp = getsectp(land->lnd_x, land->lnd_y);
if (sp->sct_off) if (sp->sct_off)
return 1; return;
mult = 1; mult = 1;
if (np->nat_level[NAT_TLEV] < land->lnd_tech * 0.85) if (np->nat_level[NAT_TLEV] < land->lnd_tech * 0.85)
mult = 2; mult = 2;
if (land->lnd_effic == 100) { if (land->lnd_effic == 100) {
/* land is ok; no repairs needed */ /* land is ok; no repairs needed */
return 1; return;
} }
if (sp->sct_own != land->lnd_own) if (sp->sct_own != land->lnd_own)
return 1; return;
if (!player->simulation) if (!player->simulation)
avail = sp->sct_avail * 100; avail = sp->sct_avail * 100;
@ -266,7 +260,7 @@ landrepair(struct lndstr *land, struct natstr *np,
w_p_eff = LND_BLD_WORK(lp->l_lcm, lp->l_hcm); w_p_eff = LND_BLD_WORK(lp->l_lcm, lp->l_hcm);
delta = roundavg((double)avail / w_p_eff); delta = roundavg((double)avail / w_p_eff);
if (delta <= 0) if (delta <= 0)
return 1; return;
if (delta > (int)((float)etus * land_grow_scale)) if (delta > (int)((float)etus * land_grow_scale))
delta = (int)((float)etus * land_grow_scale); delta = (int)((float)etus * land_grow_scale);
@ -341,10 +335,7 @@ landrepair(struct lndstr *land, struct natstr *np,
np->nat_money -= mult * lp->l_cost * build / 100.0; np->nat_money -= mult * lp->l_cost * build / 100.0;
if (!player->simulation) { if (!player->simulation) {
land->lnd_effic += (signed char)build; land->lnd_effic += (signed char)build;
putsect(sp);
} }
return 1;
} }
/* /*
@ -372,6 +363,8 @@ feed_land(struct lndstr *lp, int etus, int *needed, int doit)
starved = 0; starved = 0;
*needed = 0; *needed = 0;
if (doit)
resupply_commod(lp, I_FOOD);
/* /*
* If we're on a ship, and we don't have enough food, * If we're on a ship, and we don't have enough food,
* get some food off the carrying ship. (Don't starve * get some food off the carrying ship. (Don't starve

44
src/lib/update/ship.c
View file

@ -55,10 +55,8 @@
#include "lost.h" #include "lost.h"
#include "budg.h" #include "budg.h"
static int shiprepair(struct shpstr *, struct natstr *, static void shiprepair(struct shpstr *, struct natstr *, int *, int);
int *, int); static void upd_ship(struct shpstr *, int, struct natstr *, int *, int);
static void upd_ship(struct shpstr *, int,
struct natstr *, int *, int);
int int
prod_ship(int etus, int natnum, int *bp, int build) prod_ship(int etus, int natnum, int *bp, int build)
@ -76,8 +74,14 @@ prod_ship(int etus, int natnum, int *bp, int build)
continue; continue;
if (sp->shp_own != natnum) if (sp->shp_own != natnum)
continue; continue;
if (sp->shp_effic < SHIP_MINEFF) {
makelost(EF_SHIP, sp->shp_own, sp->shp_uid,
sp->shp_x, sp->shp_y);
sp->shp_own = 0;
continue;
}
np = getnatp(sp->shp_own); np = getnatp(sp->shp_own);
start_money = np->nat_money;
if (lastx == 9999 || lasty == 9999) { if (lastx == 9999 || lasty == 9999) {
lastx = sp->shp_x; lastx = sp->shp_x;
lasty = sp->shp_y; lasty = sp->shp_y;
@ -88,6 +92,7 @@ prod_ship(int etus, int natnum, int *bp, int build)
bp_clear_cachepath(); bp_clear_cachepath();
bp_enable_cachepath(); bp_enable_cachepath();
} }
start_money = np->nat_money;
upd_ship(sp, etus, np, bp, build); upd_ship(sp, etus, np, bp, build);
if (build && !player->simulation) /* make sure to only autonav once */ if (build && !player->simulation) /* make sure to only autonav once */
nav_ship(sp); /* autonav the ship */ nav_ship(sp); /* autonav the ship */
@ -131,12 +136,7 @@ upd_ship(struct shpstr *sp, int etus,
if (build == 1) { if (build == 1) {
if (np->nat_priorities[PRI_SBUILD] == 0 || np->nat_money < 0) if (np->nat_priorities[PRI_SBUILD] == 0 || np->nat_money < 0)
return; return;
if (sp->shp_effic < SHIP_MINEFF || !shiprepair(sp, np, bp, etus)) { shiprepair(sp, np, bp, etus);
makelost(EF_SHIP, sp->shp_own, sp->shp_uid,
sp->shp_x, sp->shp_y);
sp->shp_own = 0;
return;
}
} else { } else {
mult = 1; mult = 1;
if (np->nat_level[NAT_TLEV] < sp->shp_tech * 0.85) if (np->nat_level[NAT_TLEV] < sp->shp_tech * 0.85)
@ -163,10 +163,8 @@ upd_ship(struct shpstr *sp, int etus,
if (!player->simulation) { if (!player->simulation) {
sectp = getsectp(sp->shp_x, sp->shp_y); sectp = getsectp(sp->shp_x, sp->shp_y);
/* produce oil */
if ((mp->m_flags & M_OIL) && sectp->sct_type == SCT_WATER) { if ((mp->m_flags & M_OIL) && sectp->sct_type == SCT_WATER) {
/*
* take care of oil production
*/
product = &pchr[P_OIL]; product = &pchr[P_OIL];
oil_gained = roundavg(total_work(100, etus, oil_gained = roundavg(total_work(100, etus,
sp->shp_item[I_CIVIL], sp->shp_item[I_CIVIL],
@ -190,6 +188,7 @@ upd_ship(struct shpstr *sp, int etus,
} }
sp->shp_item[I_OIL] += oil_gained; sp->shp_item[I_OIL] += oil_gained;
} }
/* produce fish */
if ((mp->m_flags & M_FOOD) && sectp->sct_type == SCT_WATER) { if ((mp->m_flags & M_FOOD) && sectp->sct_type == SCT_WATER) {
product = &pchr[P_FOOD]; product = &pchr[P_FOOD];
sp->shp_item[I_FOOD] sp->shp_item[I_FOOD]
@ -202,6 +201,7 @@ upd_ship(struct shpstr *sp, int etus,
* sectp->sct_fertil / 100.0 * sectp->sct_fertil / 100.0
* prod_eff(product, sp->shp_tech)); * prod_eff(product, sp->shp_tech));
} }
/* feed */
if ((n = feed_ship(sp, etus, &needed, 1)) > 0) { if ((n = feed_ship(sp, etus, &needed, 1)) > 0) {
wu(0, sp->shp_own, "%d starved on %s\n", n, prship(sp)); wu(0, sp->shp_own, "%d starved on %s\n", n, prship(sp));
if (n > 10) if (n > 10)
@ -272,9 +272,8 @@ upd_ship(struct shpstr *sp, int etus,
* battleships +8 % eff each etu. This will cost around * battleships +8 % eff each etu. This will cost around
* 8 * 8 * $40 = $2560! * 8 * 8 * $40 = $2560!
*/ */
static int static void
shiprepair(struct shpstr *ship, struct natstr *np, shiprepair(struct shpstr *ship, struct natstr *np, int *bp, int etus)
int *bp, int etus)
{ {
int delta; int delta;
struct sctstr *sp; struct sctstr *sp;
@ -296,7 +295,7 @@ shiprepair(struct shpstr *ship, struct natstr *np,
rel = getrel(getnatp(sp->sct_own), ship->shp_own); rel = getrel(getnatp(sp->sct_own), ship->shp_own);
if (rel < FRIENDLY) if (rel < FRIENDLY)
return 1; return;
} }
wf = 0; wf = 0;
@ -319,7 +318,7 @@ shiprepair(struct shpstr *ship, struct natstr *np,
w_p_eff = SHP_BLD_WORK(mp->m_lcm, mp->m_hcm); w_p_eff = SHP_BLD_WORK(mp->m_lcm, mp->m_hcm);
if ((sp->sct_off) && (sp->sct_own == ship->shp_own)) if ((sp->sct_off) && (sp->sct_own == ship->shp_own))
return 1; return;
mult = 1; mult = 1;
if (np->nat_level[NAT_TLEV] < ship->shp_tech * 0.85) if (np->nat_level[NAT_TLEV] < ship->shp_tech * 0.85)
@ -327,13 +326,13 @@ shiprepair(struct shpstr *ship, struct natstr *np,
if (ship->shp_effic == 100) { if (ship->shp_effic == 100) {
/* ship is ok; no repairs needed */ /* ship is ok; no repairs needed */
return 1; return;
} }
left = 100 - ship->shp_effic; left = 100 - ship->shp_effic;
delta = roundavg((double)avail / w_p_eff); delta = roundavg((double)avail / w_p_eff);
if (delta <= 0) if (delta <= 0)
return 1; return;
if (delta > (int)((float)etus * ship_grow_scale)) if (delta > (int)((float)etus * ship_grow_scale))
delta = (int)((float)etus * ship_grow_scale); delta = (int)((float)etus * ship_grow_scale);
if (delta > left) if (delta > left)
@ -394,8 +393,7 @@ shiprepair(struct shpstr *ship, struct natstr *np,
np->nat_money -= mult * mp->m_cost * build / 100.0; np->nat_money -= mult * mp->m_cost * build / 100.0;
if (!player->simulation) if (!player->simulation)
ship->shp_effic += build; ship->shp_effic += (signed char)build;
return 1;
} }
/* /*