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

(add, plane_bomb, pinflak_planedamage, doship, dounit, doplane, laun)

Browse source 
(launch_sat, scra, scut, scuttle_ship, scuttle_land, knockdown)
(ac_planedamage, detonate, attack_val, defense_val, air_damage)
(msl_intercept, msl_launch_mindam, pln_prewrite, shp_prewrite):
Simplify unit destruction: just zero efficiency, leave makelost()
etc. to the prewrite callback.
This commit is contained in:
Markus Armbruster 2006-05-27 19:25:12 +00:00
parent 1b94ddedc3
commit 0c1bd8e98b
14 changed files with 26 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/lib/commands/scut.c
View file

@ -164,9 +164,7 @@ scut(void)
getship(item.plane.pln_ship, &ship);
take_plane_off_ship(&item.plane, &ship);
}
makelost(EF_PLANE, item.plane.pln_own, item.plane.pln_uid,
item.plane.pln_x, item.plane.pln_y);
item.plane.pln_own = 0;
item.plane.pln_effic = 0;
putplane(item.plane.pln_uid, &item.plane);
}
pr(" scuttled in %s\n",
@ -271,9 +269,7 @@ scuttle_ship(struct shpstr *sp)
wu(0, plane.pln_own, "Plane %d scuttled in %s\n",
plane.pln_uid,
xyas(plane.pln_x, plane.pln_y, plane.pln_own));
makelost(EF_PLANE, plane.pln_own, plane.pln_uid,
plane.pln_x, plane.pln_y);
plane.pln_own = 0;
plane.pln_effic = 0;
} else {
wu(0, plane.pln_own,
"Plane %d transferred off ship %d to %s\n",
@ -299,8 +295,7 @@ scuttle_ship(struct shpstr *sp)
scuttle_land(&land);
}
}
makelost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x, sp->shp_y);
sp->shp_own = 0;
sp->shp_effic = 0;
putship(sp->shp_uid, sp);
}
@ -323,9 +318,7 @@ scuttle_land(struct lndstr *lp)
wu(0, plane.pln_own, "Plane %d scuttled in %s\n",
plane.pln_uid,
xyas(plane.pln_x, plane.pln_y, plane.pln_own));
makelost(EF_PLANE, plane.pln_own, plane.pln_uid,
plane.pln_x, plane.pln_y);
plane.pln_own = 0;
plane.pln_effic = 0;
} else {
wu(0, plane.pln_own,
"Plane %d transferred off unit %d to %s\n",
@ -351,7 +344,6 @@ scuttle_land(struct lndstr *lp)
scuttle_land(&land);
}
}
makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
lp->lnd_own = 0;
lp->lnd_effic = 0;
putland(lp->lnd_uid, lp);
}