From: Markus Armbruster <armbru@pond.sub.org>
Date: Tue, 17 Mar 2009 19:19:49 +0000 (+0100)
Subject: Fix recipient thread in output journal
X-Git-Tag: hvy-plastic-1.1^0
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=56c28caf5b5f1abefe415a6a27d2d9bb610315c5

Fix recipient thread in output journal

Output journaling was cherry-picked from Hvy Metal II.  However, how
threads are identified in the journal changed since then.
journal_output_1() needs updating for that.
---

diff --git a/src/lib/subs/journal.c b/src/lib/subs/journal.c
index 12d78e28a..ffe59f7d2 100644
--- a/src/lib/subs/journal.c
+++ b/src/lib/subs/journal.c
@@ -201,16 +201,12 @@ journal_output(struct player *pl, int id, char *output)
     }
 }
 
-void
+static void
 journal_output_1(struct player *pl, int id,
 		 char *buf1, char *buf2, int buf2prec)
 {
-    if (pl && pl->state == PS_PLAYING)
-	journal_entry("output %d %d %s%.*s",
-		      pl->cnum, id, buf1, buf2prec, buf2);
-    else
-	journal_entry("output %p %d %s%.*s",
-		      pl, id, buf1, buf2prec, buf2);
+    journal_entry("output %s %d %s%.*s",
+		  empth_name(empth_self()), id, buf1, buf2prec, buf2);
 }
 
 void