projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify command word handling.
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index a20c3dd15200ac3d51e5de3517d5509c8baad9cc..1e7a0962f65d7684f1df8cd1f193d4512af7da49 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-87,7
+87,7
@@
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 {NO_WORD_TYPE, MOTION, OBJECT, ACTION, NUMERIC} word_type_t
;
typedef enum scorebonus {none, splatter, defeat, victory} score_t;
typedef enum scorebonus {none, splatter, defeat, victory} score_t;
@@
-101,11
+101,8
@@
enum phase_codes {
GO_TOP,
GO_CLEAROBJ,
GO_CHECKHINT,
GO_TOP,
GO_CLEAROBJ,
GO_CHECKHINT,
- GO_DIRECTION,
GO_WORD2,
GO_WORD2,
- GO_SPECIALS,
GO_UNKNOWN,
GO_UNKNOWN,
- GO_ACTION,
GO_DWARFWAKE,
};
GO_DWARFWAKE,
};
@@
-186,13
+183,15
@@
struct settings_t {
bool prompt;
};
bool prompt;
};
+typedef struct {
+ char raw[LINESIZE];
+ vocab_t id;
+ word_type_t type;
+} command_word_t;
+
struct command_t {
struct command_t {
- char raw1[LINESIZE], raw2[LINESIZE];
enum speechpart part;
enum speechpart part;
- vocab_t id1;
- vocab_t id2;
- enum wordtype type1;
- enum wordtype type2;
+ command_word_t word[2];
verb_t verb;
obj_t obj;
};
verb_t verb;
obj_t obj;
};
@@
-225,10
+224,17
@@
extern int suspend(void);
extern int resume(void);
extern int restore(FILE *);
extern long initialise(void);
extern int resume(void);
extern int restore(FILE *);
extern long initialise(void);
-extern int action(struct command_t
*
command);
+extern int action(struct command_t command);
extern void state_change(obj_t, int);
void bug(enum bugtype, const char *) __attribute__((__noreturn__));
extern void state_change(obj_t, int);
void bug(enum bugtype, const char *) __attribute__((__noreturn__));
+/* represent an empty command word */
+static const command_word_t empty_command_word = {
+ .raw = "",
+ .id = WORD_EMPTY,
+ .type = NO_WORD_TYPE,
+};
+
/* end */
/* end */