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

(msl_intercept): msl_hit() expects plain WHAT argument, without owner.

Browse source 
Passing it with owner gets the owner printed twice.  Fix.
This commit is contained in:
Markus Armbruster 2004-08-17 16:57:43 +00:00
parent 8ef7f35a56
commit 91c316afaa
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -235,7 +235,6 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
s_char *att_name; s_char *att_name;
s_char *def_name; s_char *def_name;
int news_item; int news_item;
s_char what[512];
s_char *who = sublaunch ? (s_char *)"" : cname(bombown); s_char *who = sublaunch ? (s_char *)"" : cname(bombown);
getsect(x, y, &sect); getsect(x, y, &sect);
@ -259,7 +258,6 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
def_name = "tomato"; /* heh -KHS */ def_name = "tomato"; /* heh -KHS */
news_item = N_NUKE_STOP; news_item = N_NUKE_STOP;
} }
sprintf(what, "%s %s", who, att_name);
irvlist = &foo; irvlist = &foo;
/* get all hostile abms in range */ /* get all hostile abms in range */
@ -343,8 +341,8 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
} }
if (!destroyed && if (!destroyed &&
msl_hit(pp, hardtarget, EF_PLANE, news_item, news_item, what, msl_hit(pp, hardtarget, EF_PLANE, news_item, news_item,
x, y, bombown)) { att_name, x, y, bombown)) {
mpr(bombown, "%s destroyed by %s %s!\n", att_name, mpr(bombown, "%s destroyed by %s %s!\n", att_name,
cname(pp->pln_own), def_name); cname(pp->pln_own), def_name);
if (sect.sct_own) if (sect.sct_own)