Clean up remnant magic labels.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index ee8e3faa9808e33b831669291ddd986fcfb65147..93681a630d71084e7ffd9fb3864e12817de208ac 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -14,15 +14,11 @@
 #define INTRANSITIVE   -1              /* illegal object number */
 #define SPECIALBASE    300             /* base umber of special rooms */
 
-typedef struct lcg_state
-{
-  unsigned long a, c, m, x;
-} lcg_state;
-
 typedef long token_t;  /* word token - someday this will be char[TOKLEN+1] */
 typedef long vocab_t;  /* index into a vocabulary array */
 
 struct game_t {
+    unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
     long abbnum;
     long blklin;
     long bonus;
@@ -81,13 +77,12 @@ extern const char ascii_to_advent[];
 extern const char advent_to_ascii[];
 extern FILE *logfp;
 extern bool oldstyle, editline, prompt;
-extern lcg_state lcgstate;
 
 /* b is not needed for POSIX but harmless */
 #define READ_MODE "rb"
 #define WRITE_MODE "wb"
 extern char* xstrdup(const char*);
-extern void packed_to_token(long, char token[6]);
+extern void packed_to_token(long, char token[]);
 extern void newspeak(char*);
 extern void PSPEAK(vocab_t,int);
 extern void RSPEAK(vocab_t);