archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Begin replacing tests on strings with tests on vocab IDs.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-07-03 18:21:25 -07:00
parent 07e7b8131e
commit 4f78dfea24
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
advent.h
View file

@ -184,6 +184,8 @@ struct command_t {
vocab_t obj; vocab_t obj;
token_t wd1; token_t wd1;
token_t wd2; token_t wd2;
long id1;
long id2;
char raw1[BUFSIZ], raw2[BUFSIZ]; char raw1[BUFSIZ], raw2[BUFSIZ];
}; };

38
main.c
View file

@ -946,7 +946,6 @@ static void listobjects(void)
static bool do_command() static bool do_command()
/* Get and execute a command */ /* Get and execute a command */
{ {
long V1, V2;
long kmod, defn; long kmod, defn;
static long igo = 0; static long igo = 0;
static struct command_t command; static struct command_t command;
@ -1057,6 +1056,13 @@ L2600:
tokenize(inputbuf, &command); tokenize(inputbuf, &command);
char word1[TOKLEN+1];
char word2[TOKLEN+1];
packed_to_token(command.wd1, word1);
packed_to_token(command.wd2, word2);
command.id1 = get_vocab_id(word1);
command.id2 = get_vocab_id(word2);
/* Every input, check "game.foobar" flag. If zero, nothing's /* Every input, check "game.foobar" flag. If zero, nothing's
* going on. If pos, make neg. If neg, he skipped a word, * going on. If pos, make neg. If neg, he skipped a word,
* so make it zero. */ * so make it zero. */
@ -1073,7 +1079,7 @@ L2607:
} }
} }
if (command.verb == SAY && command.wd2 > 0) if (command.verb == SAY && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY)
command.verb = 0; command.verb = 0;
if (command.verb == SAY) { if (command.verb == SAY) {
command.part = transitive; command.part = transitive;
@ -1085,14 +1091,8 @@ L2607:
} else } else
lampcheck(); lampcheck();
char word1[TOKLEN+1]; if (command.id1 == ENTER && (command.id2 == STREAM ||
char word2[TOKLEN+1]; command.id2 == PROMOTE_WORD(WATER))) {
packed_to_token(command.wd1, word1);
packed_to_token(command.wd2, word2);
V1 = get_vocab_id(word1);
V2 = get_vocab_id(word2);
if (V1 == ENTER && (V2 == STREAM ||
V2 == PROMOTE_WORD(WATER))) {
if (LIQLOC(game.loc) == WATER) { if (LIQLOC(game.loc) == WATER) {
rspeak(FEET_WET); rspeak(FEET_WET);
} else { } else {
@ -1100,17 +1100,19 @@ L2607:
} }
goto L2012; goto L2012;
} }
if (V1 == ENTER && command.wd2 > 0) { if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
command.wd1 = command.wd2; /* command.wd1 = command.wd2; */
wordclear(&command.wd2); /* wordclear(&command.wd2); */
command.id1 = command.id2;
command.id2 = WORD_EMPTY;
} else { } else {
/* FIXME: Magic numbers related to vocabulary */ /* FIXME: Magic numbers related to vocabulary */
if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) || if (!((command.id1 != PROMOTE_WORD(WATER) && command.id1 != PROMOTE_WORD(OIL)) ||
(V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) { (command.id2 != PROMOTE_WORD(PLANT) && command.id2 != PROMOTE_WORD(DOOR)))) {
if (AT(DEMOTE_WORD(V2))) if (AT(DEMOTE_WORD(command.id2)))
command.wd2 = token_to_packed("POUR"); command.wd2 = token_to_packed("POUR");
} }
if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD)) if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
command.wd1 = token_to_packed("CATCH"); command.wd1 = token_to_packed("CATCH");
} }
L2620: L2620:
@ -1126,7 +1128,7 @@ L2620:
Lookup: Lookup:
packed_to_token(command.wd1, word1); packed_to_token(command.wd1, word1);
defn = get_vocab_id(word1); defn = get_vocab_id(word1);
if (defn == -1) { if (defn == WORD_NOT_FOUND) {
/* Gee, I don't understand. */ /* Gee, I don't understand. */
if (fallback_handler(inputbuf)) if (fallback_handler(inputbuf))
continue; continue;