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

Don't attempt to hide owner of sub-launched satellite

Browse source 
The attempt was pointless, because the recipient of the message could
see the owner on skywatch, and the news reported it as well.
This commit is contained in:
Markus Armbruster 2009-10-10 11:54:49 -04:00
parent 6ee75ce4e9
commit 0f0d785601
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,7 @@
static int launch_as(struct plnstr *pp); static int launch_as(struct plnstr *pp);
static int launch_missile(struct plnstr *pp, int sublaunch); static int launch_missile(struct plnstr *pp, int sublaunch);
static int launch_sat(struct plnstr *pp, int sublaunch); static int launch_sat(struct plnstr *pp);
static int msl_equip(struct plnstr *, char); static int msl_equip(struct plnstr *, char);
/* /*
@ -117,7 +117,7 @@ laun(void)
retval = launch_as(&plane); retval = launch_as(&plane);
gone = 1; gone = 1;
} else { /* satellites */ } else { /* satellites */
retval = launch_sat(&plane, sublaunch); retval = launch_sat(&plane);
gone = !(plane.pln_flags & PLN_LAUNCHED); gone = !(plane.pln_flags & PLN_LAUNCHED);
} }
if (retval != RET_OK) if (retval != RET_OK)
@ -311,7 +311,7 @@ launch_missile(struct plnstr *pp, int sublaunch)
* else RET_SYN or RET_FAIL. * else RET_SYN or RET_FAIL.
*/ */
static int static int
launch_sat(struct plnstr *pp, int sublaunch) launch_sat(struct plnstr *pp)
{ {
struct plchrstr *pcp = plchr + pp->pln_type; struct plchrstr *pcp = plchr + pp->pln_type;
coord sx, sy; coord sx, sy;
@ -361,7 +361,7 @@ launch_sat(struct plnstr *pp, int sublaunch)
pr("Your trajectory was a little off.\n"); pr("Your trajectory was a little off.\n");
} }
nreport(player->cnum, N_LAUNCH, 0, 1); nreport(player->cnum, N_LAUNCH, 0, 1);
if (msl_intercept(sx, sy, pp->pln_own, pcp->pl_def, sublaunch, P_O, 0)) { if (msl_intercept(sx, sy, pp->pln_own, pcp->pl_def, 0, P_O, 0)) {
return RET_OK; return RET_OK;
} }
pp->pln_x = sx; pp->pln_x = sx;

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

@ -229,9 +229,9 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
att_name = "satellite"; att_name = "satellite";
def_name = "a-sat missile"; def_name = "a-sat missile";
news_item = N_SAT_KILL; news_item = N_SAT_KILL;
CANT_HAPPEN(sublaunch);
mpr(sect.sct_own, "%s has positioned a satellite over %s\n", mpr(sect.sct_own, "%s has positioned a satellite over %s\n",
sublaunch ? "someone" : cname(bombown), cname(bombown), xyas(x, y, sect.sct_own));
xyas(x, y, sect.sct_own));
} else if (wantflags == P_N && nowantflags == P_O) { } else if (wantflags == P_N && nowantflags == P_O) {
att_name = "warhead"; att_name = "warhead";
def_name = "abm"; def_name = "abm";