From: Markus Armbruster Date: Mon, 5 Oct 2009 11:27:43 +0000 (-0400) Subject: Move msl_equip() to callers, internal linkage X-Git-Tag: v4.3.23~20 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=f7f3178ce26f3a5088f94b1cc5f22ef5ed5bcfaf Move msl_equip() to callers, internal linkage --- diff --git a/include/prototypes.h b/include/prototypes.h index d2f8cb460..4b3cc5229 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -493,7 +493,6 @@ extern int move_ground(struct sctstr *, struct sctstr *, extern int fly_map(coord, coord); /* mslsub.c */ extern int msl_intercept(coord, coord, natid, int, int, int, int); -extern int msl_equip(struct plnstr *, char); extern int msl_hit(struct plnstr *, int, int, int, int, char *, coord, coord, int); extern void msl_sel(struct emp_qelem *, coord, coord, natid, int, diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c index 801c61a53..cc5746024 100644 --- a/src/lib/commands/laun.c +++ b/src/lib/commands/laun.c @@ -49,6 +49,7 @@ static int launch_as(struct plnstr *pp); static int launch_missile(struct plnstr *pp, int sublaunch); static int launch_sat(struct plnstr *pp, int sublaunch); +static int msl_equip(struct plnstr *, char); /* * laun @@ -374,3 +375,14 @@ launch_sat(struct plnstr *pp, int sublaunch) plane_mob_max - pp->pln_mobil); return RET_OK; } + +static int +msl_equip(struct plnstr *pp, char mission) +{ + struct plist pl; + + memset(&pl, 0, sizeof(struct plist)); + pl.pcp = plchr + pp->pln_type; + pl.plane = *pp; + return pln_equip(&pl, NULL, mission); +} diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c index dc478bc67..8b0b3daba 100644 --- a/src/lib/subs/mslsub.c +++ b/src/lib/subs/mslsub.c @@ -53,17 +53,6 @@ #include "ship.h" #include "xy.h" -int -msl_equip(struct plnstr *pp, char mission) -{ - struct plist pl; - - memset(&pl, 0, sizeof(struct plist)); - pl.pcp = plchr + pp->pln_type; - pl.plane = *pp; - return pln_equip(&pl, NULL, mission); -} - int msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item, int snews_item, char *what, coord x, coord y, int victim)