projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
YAML coverage - commented out unused arbitrary messages
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index 3015d65d1f2b65b3768dc5c070b697c08dbb6559..6efe5efbddea9ec0fd498717717e93ebe1d7f5c2 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-65,14
+65,9
@@
#define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
#define FOREST(LOC) CNDBIT(LOC, COND_FOREST)
#define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
#define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
#define FOREST(LOC) CNDBIT(LOC, COND_FOREST)
#define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
+#define INSIDE(LOC) (!OUTSID(LOC) || LOC == LOC_BUILDING)
#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,
enum bugtype {
SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST,
@@
-92,6
+87,8
@@
enum termination {endgame, quitgame, scoregame};
enum speechpart {unknown, intransitive, transitive};
enum speechpart {unknown, intransitive, transitive};
+enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL};
+
/* 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.
@@
-198,6
+195,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;
@@
-207,7
+206,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 bool wordempty(token_t);
extern void wordclear(token_t *);
extern void speak(const char*, ...);
@@
-223,7
+221,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);