projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve symbol coverage.
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index 44839a899c81a0c30f7b6600043c06e6631de309..34b855fb7c4f4ff3efcbfbab70b050032d3f453e 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-69,13
+69,6
@@
#define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
#define BUG(x) bug(x, #x)
#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,
VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3,
enum bugtype {
SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST,
VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3,
@@
-94,6
+87,10
@@
enum termination {endgame, quitgame, scoregame};
enum speechpart {unknown, intransitive, transitive};
enum speechpart {unknown, intransitive, transitive};
+enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL};
+
+typedef enum scorebonus {none, splatter, defeat, victory} score_t;
+
/* Phase codes for action returns.
* These were at one time FORTRAN line numbers.
* The values don't matter, but perturb their order at your peril.
/* Phase codes for action returns.
* These were at one time FORTRAN line numbers.
* The values don't matter, but perturb their order at your peril.
@@
-123,7
+120,7
@@
typedef long loc_t; // index into the locations 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 bonus;
+ score_t bonus; // What kind of bonus we are getting for finishing the game
long chloc;
long chloc2;
long clock1; // # turns from finding last treasure till closing
long chloc;
long chloc2;
long clock1; // # turns from finding last treasure till closing
@@
-200,6
+197,8
@@
struct command_t {
long id1;
long id2;
char raw1[LINESIZE], raw2[LINESIZE];
long id1;
long id2;
char raw1[LINESIZE], raw2[LINESIZE];
+ enum wordtype type1;
+ enum wordtype type2;
};
extern struct game_t game;
};
extern struct game_t game;
@@
-209,8
+208,6
@@
extern void packed_to_token(long, char token[]);
extern long token_to_packed(const char token[]);
extern void tokenize(char*, struct command_t *);
extern void vspeak(const char*, bool, 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 void sspeak(long msg, ...);
extern void wordclear(token_t *);
extern void speak(const char*, ...);
extern void sspeak(long msg, ...);
@@
-225,7
+222,7
@@
extern int get_motion_vocab_id(const char*);
extern int get_object_vocab_id(const char*);
extern int get_action_vocab_id(const char*);
extern int get_special_vocab_id(const char*);
extern int get_object_vocab_id(const char*);
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 get_vocab_metadata(const char*, long*, enum wordtype
*);
extern void juggle(obj_t);
extern void move(obj_t, loc_t);
extern long put(obj_t, long, long);
extern void juggle(obj_t);
extern void move(obj_t, loc_t);
extern long put(obj_t, long, long);