From 4c0d843c01ace8dd9e7775b9713e9b755a4cfb85 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 22 Mar 2008 10:07:37 +0100 Subject: [PATCH] Make mpr()'s behavior on zero first argument more obvious --- src/lib/subs/pr.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c index 8c65261b..6f2be24a 100644 --- a/src/lib/subs/pr.c +++ b/src/lib/subs/pr.c @@ -507,8 +507,9 @@ pr_beep(void) /* * Print to country CN similar to printf(). * Use printf-style FORMAT with the optional arguments. - * If CN is the current player and we're not in the update, print just - * like pr(). Else print into a bulletin. + * If CN is zero, don't print anything. + * Else, if CN is the current player and we're not in the update, + * print just like pr(). Else print into a bulletin. * Because printing like pr() requires normal text, and bulletins * require user text, only plain ASCII is allowed. */ @@ -518,15 +519,15 @@ mpr(int cn, char *format, ...) char buf[4096]; va_list ap; + if (!cn) + return; va_start(ap, format); (void)vsprintf(buf, format, ap); va_end(ap); - if (cn) { - if (update_running || cn != player->cnum) - typed_wu(0, cn, buf, TEL_BULLETIN); - else - pr_player(player, C_DATA, buf); - } + if (update_running || cn != player->cnum) + typed_wu(0, cn, buf, TEL_BULLETIN); + else + pr_player(player, C_DATA, buf); } /*