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

Clean up misuse of mpr() in msl_launch()

Browse source 
Don't use multiple calls of mpr() to print a single line, because that
creates a separate bulletin for each part.  The read command normally
merges the bulletins, but if the bulletins are more than five seconds
apart (clock jumped somehow), we get a bulletin header in the middle
of a line.

The mpr() misuse was introduced in Empire 2.
This commit is contained in:
Markus Armbruster 2010-06-06 22:39:52 +02:00
parent 4191b22758
commit 4033a3be7d
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ msl_launch(struct plnstr *pp, int type, char *what, coord x, coord y,
struct nukstr nuke; struct nukstr nuke;
struct sctstr sect; struct sctstr sect;
int sublaunch = 0; int sublaunch = 0;
char *from; char *base, *in_or_at, *from;
int dam; int dam;
mpr(pp->pln_own, "Preparing to launch %s at %s %s %s%s\n", mpr(pp->pln_own, "Preparing to launch %s at %s %s %s%s\n",
@ -71,25 +71,27 @@ msl_launch(struct plnstr *pp, int type, char *what, coord x, coord y,
what, what,
type != EF_SECTOR ? "in " : "", type != EF_SECTOR ? "in " : "",
xyas(x, y, pp->pln_own)); xyas(x, y, pp->pln_own));
mpr(pp->pln_own, "\tLaunching from ");
if (pp->pln_ship >= 0) { if (pp->pln_ship >= 0) {
getship(pp->pln_ship, &ship); getship(pp->pln_ship, &ship);
mpr(pp->pln_own, "%s in ", prship(&ship)); base = prship(&ship);
in_or_at = " in ";
if (mchr[(int)ship.shp_type].m_flags & M_SUB) { if (mchr[(int)ship.shp_type].m_flags & M_SUB) {
sublaunch = 1; sublaunch = 1;
from = "in hatch"; from = "in hatch";
} else } else
from = "on deck"; from = "on deck";
mpr(pp->pln_own, "%s\n",
xyas(ship.shp_x, ship.shp_y, pp->pln_own));
} else { } else {
if (pp->pln_harden > 0) { if (pp->pln_harden > 0) {
mpr(pp->pln_own, "missile silo at "); base = "missile silo";
in_or_at = " at ";
from = "in silo"; from = "in silo";
} else } else {
base = in_or_at = "";
from = "on launch pad"; from = "on launch pad";
mpr(pp->pln_own, "%s\n", xyas(pp->pln_x, pp->pln_y, pp->pln_own)); }
} }
mpr(pp->pln_own, "\tLaunching from %s%s%s\n",
base, in_or_at, xyas(pp->pln_x, pp->pln_y, pp->pln_own));
CANT_HAPPEN(pp->pln_flags & PLN_LAUNCHED); CANT_HAPPEN(pp->pln_flags & PLN_LAUNCHED);
pp->pln_flags |= PLN_LAUNCHED; pp->pln_flags |= PLN_LAUNCHED;