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

Cleaned up do_command() a little

Browse source
This commit is contained in:
Aaron Traas 2017-07-10 17:18:58 -04:00
parent b29f56f595
commit 4d7858d333
2 changed files with 70 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

1
advent.h
View file

@ -144,6 +144,7 @@ struct game_t {
long dtotal; long dtotal;
long foobar; // current progress in saying "FEE FIE FOE FOO". long foobar; // current progress in saying "FEE FIE FOE FOO".
long holdng; // number of objects being carried long holdng; // number of objects being carried
long igo; // How many times he's said "go" instead of the direction
long iwest; // How many times he's said "west" instead of "w" long iwest; // How many times he's said "west" instead of "w"
long knfloc; // 0 if no knife here, loc if knife , -1 after caveat long knfloc; // 0 if no knife here, loc if knife , -1 after caveat
long limit; // lifetime of lamp (not set here) long limit; // lifetime of lamp (not set here)

28
main.c
View file

@ -1008,11 +1008,8 @@ static bool do_command()
/* Get and execute a command */ /* Get and execute a command */
{ {
long kmod, defn; long kmod, defn;
static long igo = 0;
static struct command_t command; static struct command_t command;
//char inputbuf[LINESIZE];
char word1[TOKLEN + 1]; char word1[TOKLEN + 1];
//char word2[TOKLEN + 1];
command.verb = 0; command.verb = 0;
@ -1097,9 +1094,10 @@ L2600:
if (game.knfloc > 0 && game.knfloc != game.loc) if (game.knfloc > 0 && game.knfloc != game.loc)
game.knfloc = 0; game.knfloc = 0;
if(!get_command_input(&command)) { // Get command input from user
if(!get_command_input(&command))
return false; return false;
}
L2607: L2607:
++game.turns; ++game.turns;
@ -1112,11 +1110,6 @@ L2607:
} }
} }
if (command.verb == SAY && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY)
command.verb = 0;
if (command.verb == SAY) {
command.part = transitive;
} else {
if (closecheck()) { if (closecheck()) {
if (game.closed) if (game.closed)
return true; return true;
@ -1133,8 +1126,6 @@ L2607:
goto Lclearobj; goto Lclearobj;
} }
if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) { if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
/* command.wd1 = command.wd2; */
/* wordclear(&command.wd2); */
command.id1 = command.id2; command.id1 = command.id2;
command.id2 = WORD_EMPTY; command.id2 = WORD_EMPTY;
} else { } else {
@ -1147,23 +1138,22 @@ L2607:
if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == 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: Lmovehint:
if (wordeq(command.wd1, token_to_packed("WEST"))) { if (wordeq(command.wd1, token_to_packed("WEST"))) {
++game.iwest; if (++game.iwest == 10)
if (game.iwest == 10)
rspeak(W_IS_WEST); rspeak(W_IS_WEST);
} }
if (wordeq(command.wd1, token_to_packed("GO")) && !wordempty(command.wd2)) { if (wordeq(command.wd1, token_to_packed("GO")) && !wordempty(command.wd2)) {
if (++igo == 10) if (++game.igo == 10)
rspeak(GO_UNNEEDED); rspeak(GO_UNNEEDED);
} }
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 == WORD_NOT_FOUND) { if (defn == WORD_NOT_FOUND) {
/* Gee, I don't understand. */
if (fallback_handler(command)) if (fallback_handler(command))
continue; continue;
/* Gee, I don't understand. */
sspeak(DONT_KNOW, command.raw1); sspeak(DONT_KNOW, command.raw1);
goto L2600; goto L2600;
} }
@ -1187,7 +1177,7 @@ Lookup:
default: default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
} }
}
switch (action(&command)) { switch (action(&command)) {
case GO_TERMINATE: case GO_TERMINATE:
return true; return true;
@ -1210,7 +1200,7 @@ Lookup:
strncpy(command.raw1, command.raw2, LINESIZE - 1); strncpy(command.raw1, command.raw2, LINESIZE - 1);
wordclear(&command.wd2); wordclear(&command.wd2);
command.raw2[0] = '\0'; command.raw2[0] = '\0';
goto L2620; goto Lmovehint;
case GO_UNKNOWN: case GO_UNKNOWN:
/* Random intransitive verbs come here. Clear obj just in case /* Random intransitive verbs come here. Clear obj just in case
* (see attack()). */ * (see attack()). */