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

148
main.c
View file

@ -1008,11 +1008,8 @@ 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 word1[TOKLEN + 1];
//char word2[TOKLEN + 1];
command.verb = 0;
@ -1097,9 +1094,10 @@ L2600:
if (game.knfloc > 0 && game.knfloc != game.loc)
game.knfloc = 0;
if(!get_command_input(&command)) {
// Get command input from user
if(!get_command_input(&command))
return false;
}
L2607:
++game.turns;
@ -1112,82 +1110,74 @@ 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 (game.closed)
return true;
} else
lampcheck();
if (command.id1 == ENTER && (command.id2 == STREAM ||
command.id2 == PROMOTE_WORD(WATER))) {
if (LIQLOC(game.loc) == WATER) {
rspeak(FEET_WET);
} else {
rspeak(WHERE_QUERY);
}
goto Lclearobj;
}
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.id2 = WORD_EMPTY;
} else {
/* FIXME: Magic numbers related to vocabulary */
if (!((command.id1 != PROMOTE_WORD(WATER) && command.id1 != PROMOTE_WORD(OIL)) ||
(command.id2 != PROMOTE_WORD(PLANT) && command.id2 != PROMOTE_WORD(DOOR)))) {
if (AT(DEMOTE_WORD(command.id2)))
command.wd2 = token_to_packed("POUR");
}
if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
command.wd1 = token_to_packed("CATCH");
}
L2620:
if (wordeq(command.wd1, token_to_packed("WEST"))) {
++game.iwest;
if (game.iwest == 10)
rspeak(W_IS_WEST);
}
if (wordeq(command.wd1, token_to_packed("GO")) && !wordempty(command.wd2)) {
if (++igo == 10)
rspeak(GO_UNNEEDED);
}
Lookup:
packed_to_token(command.wd1, word1);
defn = get_vocab_id(word1);
if (defn == WORD_NOT_FOUND) {
/* Gee, I don't understand. */
if (fallback_handler(command))
continue;
sspeak(DONT_KNOW, command.raw1);
goto L2600;
}
/* FIXME: magic numbers related to vocabulary */
kmod = MOD(defn, 1000);
switch (defn / 1000) {
case 0:
playermove(kmod);
if (closecheck()) {
if (game.closed)
return true;
case 1:
command.part = unknown;
command.obj = kmod;
break;
case 2:
command.part = intransitive;
command.verb = kmod;
break;
case 3:
speak(specials[kmod].message);
goto Lclearobj;
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
} else
lampcheck();
if (command.id1 == ENTER && (command.id2 == STREAM ||
command.id2 == PROMOTE_WORD(WATER))) {
if (LIQLOC(game.loc) == WATER) {
rspeak(FEET_WET);
} else {
rspeak(WHERE_QUERY);
}
goto Lclearobj;
}
if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
command.id1 = command.id2;
command.id2 = WORD_EMPTY;
} else {
/* FIXME: Magic numbers related to vocabulary */
if (!((command.id1 != PROMOTE_WORD(WATER) && command.id1 != PROMOTE_WORD(OIL)) ||
(command.id2 != PROMOTE_WORD(PLANT) && command.id2 != PROMOTE_WORD(DOOR)))) {
if (AT(DEMOTE_WORD(command.id2)))
command.wd2 = token_to_packed("POUR");
}
if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
command.wd1 = token_to_packed("CATCH");
}
Lmovehint:
if (wordeq(command.wd1, token_to_packed("WEST"))) {
if (++game.iwest == 10)
rspeak(W_IS_WEST);
}
if (wordeq(command.wd1, token_to_packed("GO")) && !wordempty(command.wd2)) {
if (++game.igo == 10)
rspeak(GO_UNNEEDED);
}
Lookup:
packed_to_token(command.wd1, word1);
defn = get_vocab_id(word1);
if (defn == WORD_NOT_FOUND) {
if (fallback_handler(command))
continue;
/* Gee, I don't understand. */
sspeak(DONT_KNOW, command.raw1);
goto L2600;
}
/* FIXME: magic numbers related to vocabulary */
kmod = MOD(defn, 1000);
switch (defn / 1000) {
case 0:
playermove(kmod);
return true;
case 1:
command.part = unknown;
command.obj = kmod;
break;
case 2:
command.part = intransitive;
command.verb = kmod;
break;
case 3:
speak(specials[kmod].message);
goto Lclearobj;
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
}
switch (action(&command)) {
case GO_TERMINATE:
return true;
@ -1210,7 +1200,7 @@ Lookup:
strncpy(command.raw1, command.raw2, LINESIZE - 1);
wordclear(&command.wd2);
command.raw2[0] = '\0';
goto L2620;
goto Lmovehint;
case GO_UNKNOWN:
/* Random intransitive verbs come here. Clear obj just in case
* (see attack()). */