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

update: Fix plane maintenance in orbit

Browse source 
No maintenance is paid when a satellite is in orbit.  Broken in 4.2.2.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-21 06:49:37 +02:00
parent 55be3c7105
commit ac1a755e33
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,13 +68,6 @@ prod_plane(int etus, int natnum, struct bp *bp, int buildem)
continue;
}
if (pln_is_in_orbit(pp)) {
if (!player->simulation && buildem == 0
&& !(pp->pln_flags & PLN_SYNCHRONOUS))
move_sat(pp);
continue;
}
upd_plane(pp, etus, bp, buildem);
}
}
@ -116,6 +109,11 @@ upd_plane(struct plnstr *pp, int etus, struct bp *bp, int build)
cost = etus * pcp->pl_mat[I_MILIT] * -money_mil * 5;
budget->bm[BUDG_PLN_MAINT].money -= cost;
budget->money -= cost;
if (pln_is_in_orbit(pp) && !(pp->pln_flags & PLN_SYNCHRONOUS)) {
if (!player->simulation)
move_sat(pp);
}
}
}