New journal event command

Redundant information, but makes the journal easier to read.  The
redundancy might help making a journal replay tool robust.

Put it in Hvy Metal II now to gather some real data.

diff --git a/include/journal.h b/include/journal.h
index ed2224a3035cddd36485dcaf526b2a3bf91ce7c4..d0cbacdc0134fd648668db02d937100076bba467 100644 (file)
--- a/include/journal.h
+++ b/include/journal.h
@@ -41,6 +41,7 @@ void journal_login(void);
 void journal_logout(void);
 void journal_prng(unsigned);
 void journal_input(char *);
 void journal_logout(void);
 void journal_prng(unsigned);
 void journal_input(char *);

+void journal_command(char *);

 void journal_update(int);
 
 #endif
 void journal_update(int);
 
 #endif

diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c
index f629f5d383a42a09f2b481e60977bc4eb08467ae..50c0f43d832d473268334b6452c48bc94f7068b4 100644 (file)
--- a/src/lib/player/dispatch.c
+++ b/src/lib/player/dispatch.c
@@ -38,6 +38,7 @@
 #include "com.h"
 #include "empio.h"
 #include "file.h"
 #include "com.h"
 #include "empio.h"
 #include "file.h"

+#include "journal.h"

 #include "match.h"
 #include "misc.h"
 #include "nat.h"
 #include "match.h"
 #include "misc.h"
 #include "nat.h"


@@ -102,6 +103,7 @@ dispatch(char *buf, char *redir)
        uprnf(buf);
        pr("\n");
     }
        uprnf(buf);
        pr("\n");
     }

+    journal_command(command->c_form);

     switch (command->c_addr()) {
     case RET_OK:
        player->btused += command->c_cost;
     switch (command->c_addr()) {
     case RET_OK:
        player->btused += command->c_cost;

diff --git a/src/lib/subs/journal.c b/src/lib/subs/journal.c
index cd187132a122e9043edc58b56b9e0d6b553d6f40..90c34a62a01f375b6d8541466dd2ae36b368bd7e 100644 (file)
--- a/src/lib/subs/journal.c
+++ b/src/lib/subs/journal.c
@@ -44,6 +44,7 @@
  *     prng NAME SEED
  *     login CNUM HOSTADDR USER
  *     logout CNUM
  *     prng NAME SEED
  *     login CNUM HOSTADDR USER
  *     logout CNUM

+ *     command NAME

  *     input INPUT
  *     update ETU
  */
  *     input INPUT
  *     update ETU
  */


@@ -173,6 +174,13 @@ journal_input(char *input)
     journal_entry("input %s", input);
 }
 
     journal_entry("input %s", input);
 }
 

+void
+journal_command(char *cmd)
+{
+    char *eptr = strchr(cmd, ' ');
+    journal_entry("command %.*s", eptr ? (int)(eptr - cmd) : -1, cmd);
+}
+

 void
 journal_update(int etu)
 {
 void
 journal_update(int etu)
 {