From a87f73a3b575e660fa2f8cdb596251a8a36e1d1a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 29 Jul 2008 07:32:36 -0400 Subject: [PATCH] Use country number as journal thread ID when possible Before, we used the value of empth_thread(). That can be mapped to countries by tracking login and logout. Easy for machines (except when the journal is rotated while players are logged in), but tedious for humans. Quick version for Hvy Metal II. Needs further work for the stock code. --- src/lib/subs/journal.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/subs/journal.c b/src/lib/subs/journal.c index 7f450524..bfb1e9ec 100644 --- a/src/lib/subs/journal.c +++ b/src/lib/subs/journal.c @@ -80,8 +80,12 @@ journal_entry(char *fmt, ...) if (journal) { time(&now); - fprintf(journal, "%.24s %p ", ctime(&now), empth_self()); - + fprintf(journal, "%.24s ", ctime(&now)); + if (player && player->state == PS_PLAYING) + fprintf(journal, "%d ", player->cnum); + else + fprintf(journal, "%p ", empth_self()); + va_start(ap, fmt); vsnprintf(buf, sizeof(buf) - 1, fmt, ap); va_end(ap);