projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typedefify command_t; simplify code accordingly.
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index 481b5219536a68d57bb6b5b0ca3c802ad22892e5..5386ff786c27c06538d5bb1964f410ff4fcdb596 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-413,60
+413,60
@@
static bool is_valid_int(const char *str)
return true;
}
return true;
}
-static void get_vocab_metadata(co
nst char* word, vocab_t* id, word_type_t* type
)
+static void get_vocab_metadata(co
mmand_word_t* word
)
{
/* Check for an empty string */
{
/* Check for an empty string */
- if (strncmp(word, "", sizeof("")) == 0) {
-
*
id = WORD_EMPTY;
-
*
type = NO_WORD_TYPE;
+ if (strncmp(word
->raw
, "", sizeof("")) == 0) {
+
word->
id = WORD_EMPTY;
+
word->
type = NO_WORD_TYPE;
return;
}
vocab_t ref_num;
return;
}
vocab_t ref_num;
- ref_num = get_motion_vocab_id(word);
+ ref_num = get_motion_vocab_id(word
->raw
);
if (ref_num != WORD_NOT_FOUND) {
if (ref_num != WORD_NOT_FOUND) {
-
*
id = ref_num;
-
*
type = MOTION;
+
word->
id = ref_num;
+
word->
type = MOTION;
return;
}
return;
}
- ref_num = get_object_vocab_id(word);
+ ref_num = get_object_vocab_id(word
->raw
);
if (ref_num != WORD_NOT_FOUND) {
if (ref_num != WORD_NOT_FOUND) {
-
*
id = ref_num;
-
*
type = OBJECT;
+
word->
id = ref_num;
+
word->
type = OBJECT;
return;
}
return;
}
- ref_num = get_action_vocab_id(word);
+ ref_num = get_action_vocab_id(word
->raw
);
if (ref_num != WORD_NOT_FOUND) {
if (ref_num != WORD_NOT_FOUND) {
-
*
id = ref_num;
-
*
type = ACTION;
+
word->
id = ref_num;
+
word->
type = ACTION;
return;
}
// Check for the reservoir magic word.
return;
}
// Check for the reservoir magic word.
- if (strcasecmp(word, game.zzword) == 0) {
-
*
id = PART;
-
*
type = ACTION;
+ if (strcasecmp(word
->raw
, game.zzword) == 0) {
+
word->
id = PART;
+
word->
type = ACTION;
return;
}
// Check words that are actually numbers.
return;
}
// Check words that are actually numbers.
- if (is_valid_int(word)) {
-
*
id = WORD_EMPTY;
-
*
type = NUMERIC;
+ if (is_valid_int(word
->raw
)) {
+
word->
id = WORD_EMPTY;
+
word->
type = NUMERIC;
return;
}
return;
}
-
*
id = WORD_NOT_FOUND;
-
*
type = NO_WORD_TYPE;
+
word->
id = WORD_NOT_FOUND;
+
word->
type = NO_WORD_TYPE;
return;
}
return;
}
-static void tokenize(char* raw,
struct
command_t *cmd)
+static void tokenize(char* raw, command_t *cmd)
{
{
- memset(cmd, '\0', sizeof(
struct
command_t));
+ memset(cmd, '\0', sizeof(command_t));
/* Bound prefix on the %s would be needed to prevent buffer
* overflow. but we shortstop this more simply by making each
/* Bound prefix on the %s would be needed to prevent buffer
* overflow. but we shortstop this more simply by making each
@@
-496,11
+496,11
@@
static void tokenize(char* raw, struct command_t *cmd)
}
/* populate command with parsed vocabulary metadata */
}
/* populate command with parsed vocabulary metadata */
- get_vocab_metadata(
cmd->word[0].raw, &(cmd->word[0].id), &(cmd->word[0].type
));
- get_vocab_metadata(
cmd->word[1].raw, &(cmd->word[1].id), &(cmd->word[1].type
));
+ get_vocab_metadata(
&(cmd->word[0]
));
+ get_vocab_metadata(
&(cmd->word[1]
));
}
}
-bool get_command_input(
struct
command_t *command)
+bool get_command_input(command_t *command)
/* Get user input on stdin, parse and map to command */
{
char inputbuf[LINESIZE];
/* Get user input on stdin, parse and map to command */
{
char inputbuf[LINESIZE];