-extern long LNLENG, LNPOSN, PARMS[];
-extern char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[], MAP2[];
-extern FILE *logfp;
-extern bool oldstyle;
-extern lcg_state lcgstate;
-
-/* b is not needed for POSIX but harmless */
-#define READ_MODE "rb"
-#define WRITE_MODE "wb"
-
-extern void SPEAK(vocab_t);
-extern void PSPEAK(vocab_t,int);
-extern void RSPEAK(vocab_t);
-extern void SETPRM(long,long,long);
-
-extern bool fGETIN(FILE *,token_t*,token_t*,token_t*,token_t*);
-#define GETIN(input,WORD1,WORD1X,WORD2,WORD2X) fGETIN(input,&WORD1,&WORD1X,&WORD2,&WORD2X)
-
-extern long YES(FILE *,vocab_t,vocab_t,vocab_t);
-extern long GETTXT(bool,bool,bool);
-extern token_t MAKEWD(long);
-
-extern void fPUTTXT(token_t,long*,long);
-#define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE)
-
-extern void SHFTXT(long,long);
-extern void TYPE0(void);
-
-extern void fSAVWDS(long*,long*,long*,long*,long*,long*,long*);
-#define SAVWDS(W1,W2,W3,W4,W5,W6,W7) fSAVWDS(&W1,&W2,&W3,&W4,&W5,&W6,&W7)
-extern void fSAVARR(long*,long);
-#define SAVARR(ARR,N) fSAVARR(ARR,N)
-extern void fSAVWRD(long,long*);
-#define SAVWRD(OP,WORD) fSAVWRD(OP,&WORD)
-
-extern long VOCAB(long,long);
-extern void DSTROY(long);
-extern void JUGGLE(long);
-extern void MOVE(long,long);
-extern long PUT(long,long,long);
-extern void CARRY(long,long);
-extern void DROP(long,long);
-extern long ATDWRF(long);
-extern long SETBIT(long);
-extern bool TSTBIT(long,int);
-extern long RNDVOC(long,long);
-extern void BUG(long);
-extern void MAPLIN(FILE *);
-extern void TYPE(void);
-extern void MPINIT(void);
-
-extern void fSAVEIO(long,long,long*);
-#define SAVEIO(OP,IN,ARR) fSAVEIO(OP,IN,ARR)
-extern void DATIME(long*, long*);
-
-extern long MOD(long,long);
-
-extern void set_seed(long);
-extern unsigned long get_next_lcg_value(void);
-extern long randrange(long);
-extern void score(long);
-
-/* vocabulary items */
-extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
- BIRD, BLOOD, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
- CLAM, COINS, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
- EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD, GRATE, HINT, INVENT,
- JADE, KEYS, KNIFE, LAMP, LOCK, LOOK, MAGZIN, MESSAG, MIRROR, NUGGET, NUL,
- OGRE, OIL, OYSTER, PANIC, PEARL, PILLOW, PLANT, PLANT2, PYRAM,
- RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY, SECT, SIGN, SNAKE,
- STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2,
- URN, VASE, VEND, VOLCAN, WATER;
-/* evrything else */
-extern long I, J, K, L, SPK, V1, V2, VRSION, WD1, WD1X, WD2, WD2X;
+typedef struct {
+ enum speechpart part;
+ command_word_t word[2];
+ verb_t verb;
+ obj_t obj;
+} command_t;
+
+extern struct game_t game;
+extern struct settings_t settings;
+
+extern bool get_command_input(command_t *);
+extern void speak(const char*, ...);
+extern void sspeak(int msg, ...);
+extern void pspeak(vocab_t, enum speaktype, int, bool, ...);
+extern void rspeak(vocab_t, ...);
+extern void echo_input(FILE*, const char*, const char*);
+extern bool silent_yes(void);
+extern bool yes(const char*, const char*, const char*);
+extern void juggle(obj_t);
+extern void move(obj_t, loc_t);
+extern loc_t put(obj_t, long, long);
+extern void carry(obj_t, loc_t);
+extern void drop(obj_t, loc_t);
+extern int atdwrf(loc_t);
+extern long setbit(int);
+extern bool tstbit(long, int);
+extern void set_seed(int32_t);
+extern int32_t randrange(int32_t);
+extern long score(enum termination);
+extern void terminate(enum termination) __attribute__((noreturn));
+extern int savefile(FILE *, int32_t);
+extern int suspend(void);
+extern int resume(void);
+extern int restore(FILE *);
+extern long initialise(void);
+extern int action(command_t command);
+extern void state_change(obj_t, int);
+
+
+void bug(enum bugtype, const char *) __attribute__((__noreturn__));
+
+/* represent an empty command word */
+static const command_word_t empty_command_word = {
+ .raw = "",
+ .id = WORD_EMPTY,
+ .type = NO_WORD_TYPE,
+};