projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor tokenization to save raw tokens and use static buffer space...
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index c0c6265f8bbf09a4453b530fc8f5689032826c19..8ef2f5b59c950b0471e3159f675d73b392324ae2 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,11
+20,14
@@
#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 NOT_YET_FOUND -1 // 'Not found" state of treasures */
#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
@@
-148,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];
@@
-179,6
+183,7
@@
struct command_t {
vocab_t obj;
token_t wd1, wd1x;
token_t wd2, wd2x;
vocab_t obj;
token_t wd1, wd1x;
token_t wd2, wd2x;
+ char raw1[BUFSIZ], raw2[BUFSIZ];
};
extern struct game_t game;
};
extern struct game_t game;
@@
-187,8
+192,8
@@
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 char* xstrdup(const char* s);
extern void* xmalloc(size_t size);
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 long token_to_packed(const char token[
TOKLEN+1
]);
+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 vspeak(const char*, bool, va_list);
extern bool wordeq(token_t, token_t);
extern bool wordempty(token_t);