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

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