Journal output lines instead of chunks

[empserver] / src / lib / subs / pr.c

diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c
index f24172a74cb736233401c299715c29537b88e557..38bc98faccdb5469c4418a40cc7eea37c9b5da0c 100644 (file)
--- a/src/lib/subs/pr.c
+++ b/src/lib/subs/pr.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,12 +26,12 @@
  *  ---
  *
  *  pr.c: Output to players
- * 
+ *
  *  Known contributors to this file:
- *     Dave Pare, 1986, 1989 
+ *     Dave Pare, 1986, 1989
  *     Steve McClure, 1998-2000
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2005-2007
+ *     Markus Armbruster, 2005-2008
  */
 
 /*
@@ -56,6 +56,7 @@
 #include "com.h"
 #include "empio.h"
 #include "file.h"
+#include "journal.h"
 #include "misc.h"
 #include "nat.h"
 #include "player.h"
@@ -124,6 +125,7 @@ pr_id(struct player *p, int id, char *format, ...)
 
     if (p->curid >= 0) {
        io_puts(p->iop, "\n");
+       journal_output(p, "\n");
        p->curid = -1;
     }
     va_start(ap, format);
@@ -245,6 +247,7 @@ pr_player(struct player *pl, int id, char *buf)
            bp += len;
        }
     }
+    journal_output(pl, buf);
 }
 
 /*
@@ -299,6 +302,7 @@ upr_player(struct player *pl, int id, char *buf)
            io_puts(pl->iop, printbuf);
        }
     }
+    journal_output(pl, buf);
 }
 
 /*
@@ -320,6 +324,7 @@ outid(struct player *pl, int n)
     buf[1] = ' ';
     buf[2] = '\0';
     io_puts(pl->iop, buf);
+    journal_output(pl, buf);
     pl->curid = n;
 }
 
@@ -368,12 +373,6 @@ prmptrd(char *prompt, char *buf, int size)
 {
     int r;
 
-    /*
-     * Each prompt must consume one line of input.  recvclient()
-     * doesn't do that while player->aborted.
-     */
-    CANT_HAPPEN(player->aborted);
-
     if (CANT_HAPPEN(!prompt))
        prompt = "? ";
 
@@ -403,9 +402,6 @@ uprmptrd(char *prompt, char *buf, int size)
 {
     int r;
 
-    /* See prmptrd() */
-    CANT_HAPPEN(player->aborted);
-
     if (CANT_HAPPEN(!prompt))
        prompt = "? ";
 
@@ -507,8 +503,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 +515,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);
 }
 
 /*