/* 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;
Lclearobj:
game.oldobj = command.obj;
-L2600:
checkhints();
/* If closing time, check for any objects being toted with
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:
+
+Lthreshold:
++game.turns;
/* If a turn threshold has been met, apply penalties and tell
}
}
- 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;
+ 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 {
- /* 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);
+ rspeak(WHERE_QUERY);
}
- if (wordeq(command.wd1, token_to_packed("GO")) && !wordempty(command.wd2)) {
- if (++igo == 10)
- rspeak(GO_UNNEEDED);
+ 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");
+ }
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);
- 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
- }
+ 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);
+ }
+ 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 Lclearobj;
+ }
+ /* 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;
return true;
case GO_TOP:
continue; /* back to top of main interpreter loop */
- case GO_CLEAROBJ:
- goto Lclearobj;
- case GO_CHECKHINT:
- goto L2600;
case GO_CHECKFOO:
- goto L2607;
+ goto Lthreshold;
case GO_LOOKUP:
goto Lookup;
case GO_WORD2:
strncpy(command.raw1, command.raw2, LINESIZE - 1);
wordclear(&command.wd2);
command.raw2[0] = '\0';
- goto L2620;
+ goto Lookup;
case GO_UNKNOWN:
/* Random intransitive verbs come here. Clear obj just in case
* (see attack()). */
command.raw1[0] = toupper(command.raw1[0]);
sspeak(DO_WHAT, command.raw1);
command.obj = 0;
- goto L2600;
+ // Fallthrough
+ case GO_CHECKHINT: // Fallthrough
+ case GO_CLEAROBJ:
+ goto Lclearobj;
case GO_DWARFWAKE:
/* Oh dear, he's disturbed the dwarves. */
rspeak(DWARVES_AWAKEN);
projects / open-adventure.git / blobdiff