#include "dungeon.h"
#define LINESIZE 1024
-#define TOKLEN 5 // # sigificant character sin a token */
+#define TOKLEN 5 // № sigificant characters in a token */
#define NDWARVES 6 // number of dwarves
#define PIRATE NDWARVES // must be NDWARVES-1 when zero-origin
#define DALTLC LOC_NUGGET // alternate dwarf location
-#define INVLIMIT 7 // inverntory limit (# of objects)
+#define INVLIMIT 7 // inverntory limit (№ of objects)
#define INTRANSITIVE -1 // illegal object number
-#define SPECIALBASE 300 // base number of special rooms
#define GAMELIMIT 330 // base limit of turns
#define NOVICELIMIT 1000 // limit of turns for novice
#define WARNTIME 30 // late game starts at game.limit-this
/* Special object-state values - integers > 0 are object-specific */
#define STATE_NOTFOUND -1 // 'Not found" state of treasures */
-#define STATE_GROUND 0 // After discovered, before messed with
+#define STATE_FOUND 0 // After discovered, before messed with
#define STATE_IN_CAVITY 1 // State value common to all gemstones
+/* Special fixed object-state values - integers > 0 are location */
+#define IS_FIXED -1
+#define IS_FREE 0
+
/* Map a state property value to a negative range, where the object cannot be
* picked up but the value can be recovered later. Avoid colliding with -1,
* which has its own meaning. */
#define LIQUID() (game.prop[BOTTLE] == WATER_BOTTLE? WATER : game.prop[BOTTLE] == OIL_BOTTLE ? OIL : NO_OBJECT )
#define LIQLOC(LOC) (CNDBIT((LOC),COND_FLUID)? CNDBIT((LOC),COND_OILY) ? OIL : WATER : NO_OBJECT)
#define FORCED(LOC) CNDBIT(LOC, COND_FORCED)
-#define DARK(DUMMY) ((!tstbit(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP)))
+#define DARK(DUMMY) (!CNDBIT(game.loc,COND_LIT) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP)))
#define PCT(N) (randrange(100) < (N))
#define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
#define FOREST(LOC) CNDBIT(LOC, COND_FOREST)
-#define SPECIAL(LOC) ((LOC) > SPECIALBASE)
#define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
#define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
#define BUG(x) bug(x, #x)
GO_DWARFWAKE,
};
-typedef long token_t; // word token - someday this will be char[TOKLEN+1]
+typedef long token_t; // word token - someday this will be char[TOKLEN+1] */
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 */
struct game_t {
unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
long dtotal;
long foobar; // current progress in saying "FEE FIE FOE FOO".
long holdng; // number of objects being carried
+ long igo; // How many times he's said "go" instead of the direction
long iwest; // How many times he's said "west" instead of "w"
long knfloc; // 0 if no knife here, loc if knife , -1 after caveat
long limit; // lifetime of lamp (not set here)
long tally;
long thresh;
long trndex;
- long trnluz; // # points lost so far due to number of turns used
+ long trnluz; // № points lost so far due to number of turns used
long turns; // how many commands he's given (ignores yes/no)
bool wzdark; // whether the loc he's leaving was dark
char zzword[TOKLEN + 1]; // randomly generated magic word from bird
long abbrev[NLOCATIONS + 1];
long atloc[NLOCATIONS + 1];
long dseen[NDWARVES + 1]; // true if dwarf has seen him
- long dloc[NDWARVES + 1]; // location of dwarves, initially hard-wired in
- long odloc[NDWARVES + 1]; // prior loc of each dwarf, initially garbage
- long fixed[NOBJECTS + 1];
+ 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];
- long place[NOBJECTS + 1];
+ loc_t place[NOBJECTS + 1];
long hinted[NHINTS]; // hintlc[i] is how long he's been at LOC with cond bit i
long hintlc[NHINTS]; // hinted[i] is true iff hint i has been used.
long prop[NOBJECTS + 1];
struct command_t {
enum speechpart part;
- vocab_t verb;
- vocab_t obj;
+ verb_t verb;
+ obj_t obj;
token_t wd1;
token_t wd2;
long id1;
extern int get_action_vocab_id(const char*);
extern int get_special_vocab_id(const char*);
extern long get_vocab_id(const char*);
-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 void juggle(obj_t);
+extern void move(obj_t, loc_t);
+extern long 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 bool tstbit(long, int);
extern void make_zzword(char*);
extern int restore(FILE *);
extern long initialise(void);
extern int action(struct command_t *command);
+extern void state_change(obj_t, long);
+
void bug(enum bugtype, const char *) __attribute__((__noreturn__));
projects / open-adventure.git / blobdiff