projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Completed unspk'ing of vcarry.
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index ac648fecc454317b87847c96b7e4a1ddddfde28b..cca1dbab1d328e310643fc1f389639d03444f0c4 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-6,6
+6,7
@@
#include "dungeon.h"
#define LINESIZE 1024
#include "dungeon.h"
#define LINESIZE 1024
+#define TOKLEN 5 // # sigificant character sin 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 NDWARVES 6 // number of dwarves
#define PIRATE NDWARVES // must be NDWARVES-1 when zero-origin
#define DALTLC LOC_NUGGET // alternate dwarf location
@@
-19,10
+20,15
@@
#define PANICTIME 15 // time left after closing
#define BATTERYLIFE 2500 // turn limit increment from batteries
#define WORD_NOT_FOUND -1 // "Word not found" flag value for the vocab hash functions.
#define PANICTIME 15 // time left after closing
#define BATTERYLIFE 2500 // turn limit increment from batteries
#define WORD_NOT_FOUND -1 // "Word not found" flag value for the vocab hash functions.
+#define WORD_EMPTY 0 // "Word empty" flag value for the vocab hash functions
#define CARRIED -1 // Player is toting it
#define READ_MODE "rb" // b is not needed for POSIX but harmless
#define WRITE_MODE "wb" // b is not needed for POSIX but harmless
#define CARRIED -1 // Player is toting it
#define READ_MODE "rb" // b is not needed for POSIX but harmless
#define WRITE_MODE "wb" // b is not needed for POSIX but harmless
+/* 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
+
/*
* MOD(N,M) = Arithmetic modulus
* AT(OBJ) = true if on either side of two-placed object
/*
* MOD(N,M) = Arithmetic modulus
* AT(OBJ) = true if on either side of two-placed object
@@
-41,10
+47,9
@@
#define TOTING(OBJ) (game.place[OBJ] == CARRIED)
#define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc)
#define HERE(OBJ) (AT(OBJ) || TOTING(OBJ))
#define TOTING(OBJ) (game.place[OBJ] == CARRIED)
#define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc)
#define HERE(OBJ) (AT(OBJ) || TOTING(OBJ))
-#define LIQ2(PBOTL) ((1-(PBOTL))*WATER+((PBOTL)/2)*(WATER+OIL))
-#define LIQUID() (LIQ2(game.prop[BOTTLE]<0 ? -1-game.prop[BOTTLE] : game.prop[BOTTLE]))
-#define LIQLOC(LOC) (LIQ2((MOD(conditions[LOC]/2*2,8)-5)*MOD(conditions[LOC]/4,2)+1))
#define CNDBIT(L,N) (tstbit(conditions[L],N))
#define CNDBIT(L,N) (tstbit(conditions[L],N))
+#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 PCT(N) (randrange(100) < (N))
#define FORCED(LOC) CNDBIT(LOC, COND_FORCED)
#define DARK(DUMMY) ((!tstbit(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP)))
#define PCT(N) (randrange(100) < (N))
@@
-54,6
+59,12
@@
#define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
#define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
#define BUG(x) bug(x, #x)
#define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
#define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
#define BUG(x) bug(x, #x)
+#define MOTION_WORD(n) ((n) + 0)
+#define OBJECT_WORD(n) ((n) + 1000)
+#define ACTION_WORD(n) ((n) + 2000)
+#define SPECIAL_WORD(n) ((n) + 3000)
+#define PROMOTE_WORD(n) ((n) + 1000)
+#define DEMOTE_WORD(n) ((n) - 1000)
enum bugtype {
SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST,
enum bugtype {
SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST,
@@
-99,7
+110,6
@@
typedef long vocab_t; // index into a vocabulary array */
struct game_t {
unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
long abbnum; // How often to print non-abbreviated descriptions
struct game_t {
unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
long abbnum; // How often to print non-abbreviated descriptions
- long blklin;
long bonus;
long chloc;
long chloc2;
long bonus;
long chloc;
long chloc2;
@@
-142,7
+152,7
@@
struct game_t {
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
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[
6];
// randomly generated magic word from bird
+ 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];
bool blooded; // has player drunk of dragon's blood?
long abbrev[NLOCATIONS + 1];
long atloc[NLOCATIONS + 1];
@@
-157,31
+167,42
@@
struct game_t {
long prop[NOBJECTS + 1];
};
long prop[NOBJECTS + 1];
};
+/*
+ * Game application settings - settings, but not state of the game, per se.
+ * This data is not saved in a saved game.
+ */
+struct settings_t {
+ FILE *logfp;
+ bool oldstyle;
+ bool prompt;
+};
+
struct command_t {
enum speechpart part;
vocab_t verb;
vocab_t obj;
struct command_t {
enum speechpart part;
vocab_t verb;
vocab_t obj;
- token_t wd1, wd1x;
- token_t wd2, wd2x;
+ token_t wd1;
+ token_t wd2;
+ long id1;
+ long id2;
+ char raw1[BUFSIZ], raw2[BUFSIZ];
};
extern struct game_t game;
};
extern struct game_t game;
-extern FILE *logfp;
-extern bool oldstyle, editline, prompt;
+extern struct settings_t settings;
-extern char* xstrdup(const char* s);
-extern void* xmalloc(size_t size);
extern void packed_to_token(long, char token[]);
extern void packed_to_token(long, char token[]);
-extern long token_to_packed(const char token[
6
]);
-extern void tokenize(char*,
long tokens[4]
);
-extern void vspeak(const char*, va_list);
+extern long token_to_packed(const char token[]);
+extern void tokenize(char*,
struct command_t *
);
+extern void vspeak(const char*,
bool,
va_list);
extern bool wordeq(token_t, token_t);
extern bool wordempty(token_t);
extern void wordclear(token_t *);
extern void speak(const char*, ...);
extern bool wordeq(token_t, token_t);
extern bool wordempty(token_t);
extern void wordclear(token_t *);
extern void speak(const char*, ...);
-extern void pspeak(vocab_t, enum speaktype, int, ...);
+extern void sspeak(long msg, ...);
+extern void pspeak(vocab_t, enum speaktype, int, bool, ...);
extern void rspeak(vocab_t, ...);
extern void rspeak(vocab_t, ...);
-extern void echo_input(FILE*, c
har*,
char*);
+extern void echo_input(FILE*, c
onst char*, const
char*);
extern int word_count(char*);
extern char* get_input(void);
extern bool silent_yes(void);
extern int word_count(char*);
extern char* get_input(void);
extern bool silent_yes(void);
@@
-200,7
+221,6
@@
extern long atdwrf(long);
extern long setbit(long);
extern bool tstbit(long, int);
extern void make_zzword(char*);
extern long setbit(long);
extern bool tstbit(long, int);
extern void make_zzword(char*);
-extern void datime(long*, long*);
extern void set_seed(long);
extern unsigned long get_next_lcg_value(void);
extern long randrange(long);
extern void set_seed(long);
extern unsigned long get_next_lcg_value(void);
extern long randrange(long);
@@
-210,10
+230,9
@@
extern int savefile(FILE *, long);
extern int suspend(void);
extern int resume(void);
extern int restore(FILE *);
extern int suspend(void);
extern int resume(void);
extern int restore(FILE *);
-extern
void
initialise(void);
+extern
long
initialise(void);
extern int action(struct command_t *command);
extern int action(struct command_t *command);
-/* Alas, declaring this static confuses the coverage analyzer */
void bug(enum bugtype, const char *) __attribute__((__noreturn__));
/* end */
void bug(enum bugtype, const char *) __attribute__((__noreturn__));
/* end */