enum speechpart {unknown, intransitive, transitive};
-enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL};
+enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL, NUMERIC};
typedef enum scorebonus {none, splatter, defeat, victory} score_t;
GO_DWARFWAKE,
};
-typedef long token_t; // token index */
typedef long vocab_t; // index into a vocabulary array */
typedef long verb_t; // index into an actions array */
typedef long obj_t; // index into the object array */
typedef long loc_t; // index into the locations array */
+typedef long turn_t; // turn counter or threshold */
struct game_t {
unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
long abbnum; // How often to print long descriptions
score_t bonus; // What kind of finishing bonus we are getting
- long chloc;
- long chloc2;
- long clock1; // # turns from finding last treasure till closing
- long clock2; // # turns from warning till blinding flash
+ loc_t chloc; // pirate chest location
+ loc_t chloc2; // pirate chest alternate location
+ turn_t clock1; // # turns from finding last treasure to close
+ turn_t clock2; // # turns from warning till blinding flash
bool clshnt; // has player read the clue in the endgame?
bool closed; // whether we're all the way closed
bool closng; // whether it's closing time yet
long conds; // min value for cond[loc] if loc has any hints
- long detail;
+ long detail; // level of detail in descriptions
/* dflag controls the level of activation of dwarves:
* 0 No dwarf stuff yet (wait until reaches Hall Of Mists)
long igo; // # uses of "go" instead of a direction
long iwest; // # times he's said "west" instead of "w"
long knfloc; // knife location; 0 if none, -1 after caveat
- long limit; // lifetime of lamp (not set here)
+ turn_t limit; // lifetime of lamp
bool lmwarn; // has player been warned about lamp going dim?
loc_t loc; // where player is now
loc_t newloc; // where player is going
bool novice; // asked for instructions at start-up?
- long numdie; // number of times killed so far
+ turn_t numdie; // number of times killed so far
loc_t oldloc; // where player was
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
long tally; // count of treasures gained
- long thresh;
- long trndex;
- long trnluz; // # points lost so far due to turns used
- long turns; // counts commands given (ignores yes/no)
+ long thresh; // current threshold for endgame scoring tier
+ turn_t trndex; // FIXME: not used, remove on next format bump
+ turn_t trnluz; // # points lost so far due to turns used
+ turn_t turns; // counts commands given (ignores yes/no)
bool wzdark; // whether the loc he's leaving was dark
char zzword[TOKLEN + 1]; // randomly generated magic word from bird
bool blooded; // has player drunk of dragon's blood?
- long abbrev[NLOCATIONS + 1];
- long atloc[NLOCATIONS + 1];
+ long abbrev[NLOCATIONS + 1]; // has location been seen?
+ long atloc[NLOCATIONS + 1]; // head of object linked list per location
long dseen[NDWARVES + 1]; // true if dwarf has seen him
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];
- long link[NOBJECTS * 2 + 1];
- loc_t place[NOBJECTS + 1];
+ loc_t fixed[NOBJECTS + 1]; // fixed location of object (if not IS_FREE)
+ long 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
-
- long prop[NOBJECTS + 1];
+ long prop[NOBJECTS + 1]; // object state array */
};
/*
};
struct command_t {
- enum speechpart part;
- verb_t verb;
- obj_t obj;
- token_t id1;
- token_t id2;
char raw1[LINESIZE], raw2[LINESIZE];
+ enum speechpart part;
+ vocab_t id1;
+ vocab_t id2;
enum wordtype type1;
enum wordtype type2;
+ verb_t verb;
+ obj_t obj;
};
extern struct game_t game;
extern struct settings_t settings;
extern bool get_command_input(struct command_t *);
-extern void wordclear(token_t *);
extern void speak(const char*, ...);
-extern void sspeak(long msg, ...);
+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 yes(const char*, const char*, const char*);
extern void juggle(obj_t);
extern void move(obj_t, loc_t);
-extern long put(obj_t, long, long);
+extern loc_t put(obj_t, long, long);
extern void carry(obj_t, loc_t);
extern void drop(obj_t, loc_t);
-extern long atdwrf(loc_t);
-extern long setbit(long);
+extern int atdwrf(loc_t);
+extern long setbit(int);
extern bool tstbit(long, int);
-extern void make_zzword(char*);
extern void set_seed(long);
-extern unsigned long get_next_lcg_value(void);
extern long randrange(long);
extern long score(enum termination);
extern void terminate(enum termination) __attribute__((noreturn));
extern int restore(FILE *);
extern long initialise(void);
extern int action(struct command_t *command);
-extern void state_change(obj_t, long);
+extern void state_change(obj_t, int);
void bug(enum bugtype, const char *) __attribute__((__noreturn__));