Prevent tampering with PRNG parameters in save

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index a20c3dd15200ac3d51e5de3517d5509c8baad9cc..17ae719d51231dc82430eb6eaec53278e0173123 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -87,7 +87,7 @@ enum termination {endgame, quitgame, scoregame};
 
 enum speechpart {unknown, intransitive, transitive};
 
-enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL};
+typedef enum {NO_WORD_TYPE, MOTION, OBJECT, ACTION, NUMERIC} word_type_t;
 
 typedef enum scorebonus {none, splatter, defeat, victory} score_t;
 
@@ -100,12 +100,8 @@ enum phase_codes {
     GO_MOVE,
     GO_TOP,
     GO_CLEAROBJ,
-    GO_CHECKHINT,
-    GO_DIRECTION,
     GO_WORD2,
-    GO_SPECIALS,
     GO_UNKNOWN,
-    GO_ACTION,
     GO_DWARFWAKE,
 };
 
@@ -138,7 +134,7 @@ struct game_t {
     long dflag;
 
     long dkill;                  // dwarves killed
-    long dtotal;                 // total dwarves (including pirate)
+    long dtotal;                 // total dwarves (including pirate) in loc
     long foobar;                 // progress in saying "FEE FIE FOE FOO".
     long holdng;                 // number of objects being carried
     long igo;                    // # uses of "go" instead of a direction
@@ -151,7 +147,7 @@ struct game_t {
     bool novice;                 // asked for instructions at start-up?
     turn_t numdie;               // number of times killed so far
     loc_t oldloc;                // where player was
-    loc_t oldlc2;                // where player was two moves ago 
+    loc_t oldlc2;                // where player was two moves ago
     obj_t oldobj;                // last object player handled
     bool panic;                  // has player found out he's trapped?
     long saved;                  // point penalty for saves
@@ -169,7 +165,7 @@ struct game_t {
     loc_t dloc[NDWARVES + 1];    // location of dwarves, initially hard-wired in
     loc_t odloc[NDWARVES + 1];   // prior loc of each dwarf, initially garbage
     loc_t fixed[NOBJECTS + 1];   // fixed location of object (if  not IS_FREE)
-    long link[NOBJECTS * 2 + 1]; // object-list links
+    obj_t link[NOBJECTS * 2 + 1]; // object-list links
     loc_t place[NOBJECTS + 1];   // location of object
     long hinted[NHINTS];         // hinted[i] = true iff hint i has been used.
     long hintlc[NHINTS];         // hintlc[i] = how long at LOC with cond bit i
@@ -186,21 +182,23 @@ struct settings_t {
     bool prompt;
 };
 
-struct command_t {
-    char raw1[LINESIZE], raw2[LINESIZE];
+typedef struct {
+    char raw[LINESIZE];
+    vocab_t id;
+    word_type_t type;
+} command_word_t;
+
+typedef struct {
     enum speechpart part;
-    vocab_t id1;
-    vocab_t id2;
-    enum wordtype type1;
-    enum wordtype type2;
+    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(struct command_t *);
+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, ...);
@@ -225,10 +223,17 @@ extern int suspend(void);
 extern int resume(void);
 extern int restore(FILE *);
 extern long initialise(void);
-extern int action(struct command_t *command);
+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,
+};
+
 /* end */