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

update: Reorder ship, plane, land repair code for consistency

Browse source 
No functional change.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-05 15:00:42 +02:00
parent 6c4874e4d2
commit a5d90c0184
3 changed files with 31 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -194,28 +194,27 @@ upd_land(struct lndstr *lp, int etus,
static void
landrepair(struct lndstr *land, struct natstr *np, struct bp *bp, int etus)
{
struct lchrstr *lp = &lchr[(int)land->lnd_type];
int delta;
struct sctstr *sp;
struct lchrstr *lp;
int build;
int avail;
int mult;
lp = &lchr[(int)land->lnd_type];
if (land->lnd_effic == 100)
return;
sp = getsectp(land->lnd_x, land->lnd_y);
if (sp->sct_off)
return;
if (relations_with(sp->sct_own, land->lnd_own) != ALLIED)
return;
mult = 1;
if (np->nat_level[NAT_TLEV] < land->lnd_tech * 0.85)
mult = 2;
if (land->lnd_effic == 100) {
/* land is ok; no repairs needed */
return;
}
if (relations_with(sp->sct_own, land->lnd_own) != ALLIED)
return;
if (!player->simulation)
avail = sp->sct_avail * 100;
else

16
src/lib/update/plane.c
View file

@ -123,15 +123,22 @@ upd_plane(struct plnstr *pp, int etus,
static void
planerepair(struct plnstr *pp, struct natstr *np, struct bp *bp, int etus)
{
struct plchrstr *pcp = &plchr[(int)pp->pln_type];
int build;
struct shpstr *carrier;
struct plchrstr *pcp = &plchr[(int)pp->pln_type];
struct sctstr *sp = getsectp(pp->pln_x, pp->pln_y);
struct sctstr *sp;
int delta;
int mult;
int avail;
int used;
if (pp->pln_effic == 100)
return;
sp = getsectp(pp->pln_x, pp->pln_y);
if (sp->sct_off)
return;
carrier = NULL;
if (pp->pln_ship >= 0) {
if (pp->pln_effic >= 80)
@ -148,15 +155,10 @@ planerepair(struct plnstr *pp, struct natstr *np, struct bp *bp, int etus)
return;
}
if (sp->sct_off)
return;
mult = 1;
if (np->nat_level[NAT_TLEV] < pp->pln_tech * 0.85)
mult = 2;
if (pp->pln_effic == 100)
return;
if (!player->simulation)
avail = sp->sct_avail * 100;
else

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

@ -241,21 +241,29 @@ upd_ship(struct shpstr *sp, int etus,
static void
shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus)
{
struct mchrstr *mp = &mchr[(int)ship->shp_type];
int delta;
struct sctstr *sp;
struct mchrstr *mp;
int build;
int wf;
int avail;
int mult;
mp = &mchr[(int)ship->shp_type];
if (ship->shp_effic == 100)
return;
sp = getsectp(ship->shp_x, ship->shp_y);
if ((sp->sct_off) && (sp->sct_own == ship->shp_own))
return;
if (sp->sct_own != 0
&& relations_with(sp->sct_own, ship->shp_own) < FRIENDLY)
return;
mult = 1;
if (np->nat_level[NAT_TLEV] < ship->shp_tech * 0.85)
mult = 2;
/* only military can work on a military boat */
if (mp->m_glim != 0)
wf = etus * ship->shp_item[I_MILIT] / 2;
@ -265,24 +273,10 @@ shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus)
if (sp->sct_type != SCT_HARBR) {
wf /= 3;
avail = wf;
} else {
if (!player->simulation)
} else if (!player->simulation)
avail = wf + sp->sct_avail * 100;
else
avail = wf + bp_get_avail(bp, sp) * 100;
}
if ((sp->sct_off) && (sp->sct_own == ship->shp_own))
return;
mult = 1;
if (np->nat_level[NAT_TLEV] < ship->shp_tech * 0.85)
mult = 2;
if (ship->shp_effic == 100) {
/* ship is ok; no repairs needed */
return;
}
delta = roundavg((double)avail / mp->m_bwork);
if (delta <= 0)