projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Last remnants of packing removed.
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index 7eb54dc744d3e694edf5055b252b0a55e843047a..47688656260292377df2c8fdbc34aa7ae502be7e 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-101,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,
@@
-192,10
+191,8
@@
struct command_t {
enum speechpart part;
verb_t verb;
obj_t obj;
enum speechpart part;
verb_t verb;
obj_t obj;
- token_t wd1;
- token_t wd2;
- long id1;
- long id2;
+ token_t id1;
+ token_t id2;
char raw1[LINESIZE], raw2[LINESIZE];
enum wordtype type1;
enum wordtype type2;
char raw1[LINESIZE], raw2[LINESIZE];
enum wordtype type1;
enum wordtype type2;
@@
-204,11
+201,7
@@
struct command_t {
extern struct game_t game;
extern struct settings_t settings;
extern struct game_t game;
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 tokenize(char*, struct command_t *);
-extern void vspeak(const char*, bool, va_list);
-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, ...);