projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a packing call - word buffer is good enough.
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index 553d1c71a4ae98ec986373533ba0278608ffa75d..62d3696e3d924877513b85b4613af9e85e1fc227 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,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.
@@
-102,7
+101,6
@@
enum phase_codes {
GO_TOP,
GO_CLEAROBJ,
GO_CHECKHINT,
GO_TOP,
GO_CLEAROBJ,
GO_CHECKHINT,
- GO_CHECKFOO,
GO_DIRECTION,
GO_LOOKUP,
GO_WORD2,
GO_DIRECTION,
GO_LOOKUP,
GO_WORD2,
@@
-121,7
+119,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
@@
-144,6
+142,7
@@
struct game_t {
long dtotal;
long foobar; // current progress in saying "FEE FIE FOE FOO".
long holdng; // number of objects being carried
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 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)
@@
-197,6
+196,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;
@@
-205,9
+206,6
@@
extern struct settings_t settings;
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 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 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, ...);
@@
-222,7
+220,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);