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

News reported victim as actor for sub-launched anti-sat and ABM

Browse source 
If the intercepted missile was sub-launched as well, this disclosed
its owner.

The stock game's anti-sats and ABMs can't be sub-launched.
This commit is contained in:
Markus Armbruster 2009-10-13 19:33:33 -04:00
parent 4dbee9a388
commit e7fec28009
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/commands/laun.c
View file

@ -160,12 +160,13 @@ launch_as(struct plnstr *pp)
} }
if (msl_equip(pp, 'i') < 0) if (msl_equip(pp, 'i') < 0)
return RET_FAIL; return RET_FAIL;
if (msl_hit(pp, pln_def(&plane), EF_PLANE, N_SAT_KILL, N_SAT_KILL, if (msl_hit(pp, pln_def(&plane), EF_PLANE, 0, 0,
prplane(&plane), plane.pln_x, plane.pln_y, plane.pln_own)) { prplane(&plane), plane.pln_x, plane.pln_y, plane.pln_own)) {
pr("Satellite shot down\n"); pr("Satellite shot down\n");
mpr(plane.pln_own, "%s anti-sat destroyed %s over %s\n", mpr(plane.pln_own, "%s anti-sat destroyed %s over %s\n",
cname(player->cnum), prplane(&plane), cname(player->cnum), prplane(&plane),
xyas(plane.pln_x, plane.pln_y, plane.pln_own)); xyas(plane.pln_x, plane.pln_y, plane.pln_own));
nreport(pp->pln_own, N_SAT_KILL, plane.pln_own, 1);
plane.pln_effic = 0; plane.pln_effic = 0;
putplane(plane.pln_uid, &plane); putplane(plane.pln_uid, &plane);
} }

6
src/lib/subs/mslsub.c
View file

@ -294,13 +294,17 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch,
def_name, who, att_name, cname(sp->sct_own)); def_name, who, att_name, cname(sp->sct_own));
} }
if (msl_hit(pp, pln_def(msl), EF_PLANE, news_item, news_item, if (msl_hit(pp, pln_def(msl), EF_PLANE, 0, 0,
att_name, sp->sct_x, sp->sct_y, msl->pln_own)) { att_name, sp->sct_x, sp->sct_y, msl->pln_own)) {
mpr(msl->pln_own, "%s destroyed by %s %s!\n", mpr(msl->pln_own, "%s destroyed by %s %s!\n",
att_name, cname(pp->pln_own), def_name); att_name, cname(pp->pln_own), def_name);
mpr(sp->sct_own, "%s %s intercepted!\n", who, att_name); mpr(sp->sct_own, "%s %s intercepted!\n", who, att_name);
if (sp->sct_own != pp->pln_own) if (sp->sct_own != pp->pln_own)
mpr(pp->pln_own, "%s %s intercepted!\n", who, att_name); mpr(pp->pln_own, "%s %s intercepted!\n", who, att_name);
if (sublaunch)
nreport(pp->pln_own, news_item, 0, 1);
else
nreport(pp->pln_own, news_item, msl->pln_own, 1);
destroyed = 1; destroyed = 1;
} }
/* zap the missile */ /* zap the missile */