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

Isolate command input processing, got rid of label "Laction"

Browse source
This commit is contained in:
Aaron Traas 2017-07-10 16:30:51 -04:00
parent 7c610a120d
commit b29f56f595
1 changed files with 109 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

73
main.c
View file

@ -970,15 +970,49 @@ static void listobjects(void)
}
}
static bool get_command_input(struct command_t *command)
{
char inputbuf[LINESIZE];
char word1[TOKLEN + 1];
char word2[TOKLEN + 1];
char* input;
for (;;) {
input = get_input();
if (input == NULL)
return false;
if (word_count(input) > 2) {
rspeak(TWO_WORDS);
free(input);
continue;
}
if (strcmp(input, "") != 0)
break;
free(input);
}
strncpy(inputbuf, input, LINESIZE - 1);
free(input);
tokenize(inputbuf, command);
packed_to_token(command->wd1, word1);
packed_to_token(command->wd2, word2);
command->id1 = get_vocab_id(word1);
command->id2 = get_vocab_id(word2);
return true;
}
static bool do_command()
/* Get and execute a command */
{
long kmod, defn;
static long igo = 0;
static struct command_t command;
char inputbuf[LINESIZE];
//char inputbuf[LINESIZE];
char word1[TOKLEN + 1];
char word2[TOKLEN + 1];
//char word2[TOKLEN + 1];
command.verb = 0;
@ -1063,34 +1097,9 @@ L2600:
if (game.knfloc > 0 && game.knfloc != game.loc)
game.knfloc = 0;
/* This is where we get a new command from the user */
char* input;
for (;;) {
input = get_input();
if (input == NULL)
return (false);
if (word_count(input) > 2) {
rspeak(TWO_WORDS);
free(input);
continue;
if(!get_command_input(&command)) {
return false;
}
if (strcmp(input, "") != 0)
break;
free(input);
}
strncpy(inputbuf, input, LINESIZE - 1);
free(input);
tokenize(inputbuf, &command);
packed_to_token(command.wd1, word1);
packed_to_token(command.wd2, word2);
command.id1 = get_vocab_id(word1);
command.id2 = get_vocab_id(word2);
//command = get_command_input();
L2607:
++game.turns;
@ -1107,8 +1116,7 @@ L2607:
command.verb = 0;
if (command.verb == SAY) {
command.part = transitive;
goto Laction;
}
} else {
if (closecheck()) {
if (game.closed)
return true;
@ -1179,8 +1187,7 @@ Lookup:
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
}
Laction:
}
switch (action(&command)) {
case GO_TERMINATE:
return true;