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

Remove takeover_ship() and takeover_land() parameter hostile

Browse source 
All callers pass non-zero.  Simplify accordingly.
This commit is contained in:
Markus Armbruster 2008-09-14 11:30:55 -04:00
parent b8ab065a6e
commit 69b74bb5dd
3 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/prototypes.h
View file

@ -686,9 +686,9 @@ extern void resupply_commod(struct lndstr *, i_type);
extern int supply_commod(int, int, int, i_type, int);
extern int has_supply(struct lndstr *);
/* takeover.c */
extern void takeover_land(struct lndstr *, natid, int);
extern void takeover_land(struct lndstr *, natid);
extern void takeover(struct sctstr *, natid);
extern void takeover_ship(struct shpstr *, natid, int);
extern void takeover_ship(struct shpstr *, natid);
extern void takeover_plane(struct plnstr *, natid);
/* trdsub.c */
/* trechk.c */

4
src/lib/subs/attsub.c
View file

@ -2251,11 +2251,11 @@ take_def(int combat_mode, struct emp_qelem *list, struct combat *off,
putsect(&sect);
} else if (def->type == EF_SHIP) {
getship(def->shp_uid, &ship);
takeover_ship(&ship, player->cnum, 1);
takeover_ship(&ship, player->cnum);
putship(ship.shp_uid, &ship);
} else if (def->type == EF_LAND) {
getland(def->lnd_uid, &land);
takeover_land(&land, player->cnum, 1);
takeover_land(&land, player->cnum);
putland(land.lnd_uid, &land);
}
if (delete_me)

22
src/lib/subs/takeover.c
View file

@ -113,7 +113,7 @@ takeover(struct sctstr *sp, natid newown)
prland(lp),
cname(newown), xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own));
}
takeover_land(lp, newown, 1);
takeover_land(lp, newown);
}
sp->sct_avail = 0;
@ -211,7 +211,7 @@ takeover_plane(struct plnstr *pp, natid newown)
}
void
takeover_ship(struct shpstr *sp, natid newown, int hostile)
takeover_ship(struct shpstr *sp, natid newown)
{
struct plnstr *pp;
struct lndstr *lp;
@ -231,10 +231,8 @@ takeover_ship(struct shpstr *sp, natid newown, int hostile)
/* Take over planes */
snxtitem_cargo(&ni, EF_PLANE, EF_SHIP, sp->shp_uid);
while (nxtitem(&ni, pp)) {
if (hostile) {
if (pp->pln_effic > PLANE_MINEFF)
pp->pln_effic = PLANE_MINEFF;
}
if (pp->pln_effic > PLANE_MINEFF)
pp->pln_effic = PLANE_MINEFF;
pp->pln_mobil = 0;
if (opt_MOB_ACCESS)
game_tick_to_now(&pp->pln_access);
@ -247,12 +245,12 @@ takeover_ship(struct shpstr *sp, natid newown, int hostile)
/* Take over land units */
snxtitem_cargo(&ni, EF_LAND, EF_SHIP, sp->shp_uid);
while (nxtitem(&ni, lp))
takeover_land(lp, newown, hostile);
takeover_land(lp, newown);
putship(sp->shp_uid, sp);
}
void
takeover_land(struct lndstr *landp, natid newown, int hostile)
takeover_land(struct lndstr *landp, natid newown)
{
struct plnstr *pp;
struct lndstr *lp;
@ -278,10 +276,8 @@ takeover_land(struct lndstr *landp, natid newown, int hostile)
/* Take over planes */
snxtitem_cargo(&ni, EF_PLANE, EF_LAND, landp->lnd_uid);
while (nxtitem(&ni, pp)) {
if (hostile) {
if (pp->pln_effic > PLANE_MINEFF)
pp->pln_effic = PLANE_MINEFF;
}
if (pp->pln_effic > PLANE_MINEFF)
pp->pln_effic = PLANE_MINEFF;
pp->pln_mobil = 0;
if (opt_MOB_ACCESS)
game_tick_to_now(&pp->pln_access);
@ -294,6 +290,6 @@ takeover_land(struct lndstr *landp, natid newown, int hostile)
/* Take over land units */
snxtitem_cargo(&ni, EF_LAND, EF_LAND, landp->lnd_uid);
while (nxtitem(&ni, lp))
takeover_land(lp, newown, hostile);
takeover_land(lp, newown);
putland(landp->lnd_uid, landp);
}