X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=db27b16a6a8496726e6db9298e06fcbc4985e70b;hp=5a9c7c396df492eba7f5324333a2bc0e26455fb7;hb=03b2f1c86e4a7e856fadff2244b9c6456ccd8835;hpb=12b2ff74f6bbca81dc04e359f2209fe3a442e0df diff --git a/main.c b/main.c index 5a9c7c3..db27b16 100644 --- a/main.c +++ b/main.c @@ -9,9 +9,8 @@ * to idiomatic C, the following is more appropriate: * * ESR apologizes for the remaing gotos (now confined to one function - * in this file - there used to be over 350 of them, *everywhere*), - * and for the offensive globals. Applying the Structured Program - * Theorem can be hard. + * in this file - there used to be over 350 of them, *everywhere*). + * Applying the Structured Program Theorem can be hard. */ #include @@ -247,12 +246,12 @@ static bool spotted_by_pirate(int i) if (i != PIRATE) return false; - /* The pirate's spotted him. He leaves him alone once we've + /* The pirate's spotted him. Pirate leaves him alone once we've * found chest. K counts if a treasure is here. If not, and * tally=1 for an unseen chest, let the pirate be spotted. Note * that game.place[CHEST] = LOC_NOWHERE might mean that he's thrown * it to the troll, but in that case he's seen the chest - * (game.prop=0). */ + * (game.prop[CHEST] == STATE_FOUND). */ if (game.loc == game.chloc || game.prop[CHEST] != STATE_NOTFOUND) return true; @@ -322,15 +321,14 @@ static bool dwarfmove(void) * variables. Remember sixth dwarf is pirate and is thus * very different except for motion rules. */ - /* First off, don't let the dwarves follow him into a pit or - * a wall. Activate the whole mess the first time he gets as - * far as the hall of mists (loc 15). If game.newloc is - * forbidden to pirate (in particular, if it's beyond the + /* First off, don't let the dwarves follow him into a pit or a + * wall. Activate the whole mess the first time he gets as far + * as the Hall of Mists (what INDEEP() tests). If game.newloc + * is forbidden to pirate (in particular, if it's beyond the * troll bridge), bypass dwarf stuff. That way pirate can't * steal return toll, and dwarves can't meet the bear. Also * means dwarves won't follow him into dead end in maze, but - * c'est la vie. They'll wait for him outside the dead - * end. */ + * c'est la vie. They'll wait for him outside the dead end. */ if (game.loc == LOC_NOWHERE || FORCED(game.loc) || CNDBIT(game.newloc, COND_NOARRR)) @@ -344,7 +342,7 @@ static bool dwarfmove(void) } /* When we encounter the first dwarf, we kill 0, 1, or 2 of - * the 5 dwarves. If any of the survivors is at loc, + * the 5 dwarves. If any of the survivors is at game.loc, * replace him with the alternate. */ if (game.dflag == 1) { if (!INDEEP(game.loc) || @@ -399,7 +397,8 @@ static bool dwarfmove(void) else if (j > 1 && game.newloc == tk[j - 1]) continue; else if (j >= DIM(tk) - 1) - continue; + /* This can't actually happen. */ + continue; // LCOV_EXCL_LINE else if (game.newloc == game.dloc[i]) continue; else if (FORCED(game.newloc)) @@ -645,7 +644,6 @@ static void playermove( int motion) /* (ESR) We've found a destination that goes with the motion verb. * Next we need to check any conditional(s) on this destination, and * possibly on following entries. */ - /* FIXME: Magic numbers related to move opcodes */ do { for (;;) { /* L12 loop */ for (;;) { @@ -729,10 +727,11 @@ static void playermove( int motion) * wander across and encounter the bear. (They * won't follow the player there because that * region is forbidden to the pirate.) If - * game.prop(TROLL)=1, he's crossed since paying, - * so step out and block him. (standard travel - * entries check for game.prop(TROLL)=0.) Special - * stuff for bear. */ + * game.prop[TROLL]=TROLL_PAIDONCE, he's crossed + * since paying, so step out and block him. + * (standard travel entries check for + * game.prop[TROLL]=TROLL_UNPAID.) Special stuff + * for bear. */ if (game.prop[TROLL] == TROLL_PAIDONCE) { pspeak(TROLL, look, TROLL_PAIDONCE, true); game.prop[TROLL] = TROLL_UNPAID; @@ -1007,16 +1006,15 @@ static bool get_command_input(struct command_t *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); - + get_vocab_metadata(word1, &(command->id1), &(command->type1)); + get_vocab_metadata(word2, &(command->id2), &(command->type2)); + return true; } static bool do_command() /* Get and execute a command */ { - long kmod, defn; static struct command_t command; char word1[TOKLEN + 1]; @@ -1101,9 +1099,9 @@ Lclearobj: game.wzdark = DARK(game.loc); if (game.knfloc > 0 && game.knfloc != game.loc) game.knfloc = 0; - + // Get command input from user - if(!get_command_input(&command)) + if (!get_command_input(&command)) return false; Lclosecheck: @@ -1116,38 +1114,38 @@ Lclosecheck: lampcheck(); if (command.id1 == ENTER && (command.id2 == STREAM || - command.id2 == PROMOTE_WORD(WATER))) { - if (LIQLOC(game.loc) == WATER) + command.id2 == 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))) + if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) { + if (AT(command.id2)) command.wd2 = token_to_packed("POUR"); } - if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD)) + if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD)) command.wd1 = token_to_packed("CATCH"); } Lookup: - if (wordeq(command.wd1, token_to_packed("WEST"))) { + if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) { if (++game.iwest == 10) rspeak(W_IS_WEST); } - if (wordeq(command.wd1, token_to_packed("GO")) && !wordempty(command.wd2)) { + if (strncasecmp(command.raw1, "go", sizeof("go")) == 0 && !wordempty(command.wd2)) { if (++game.igo == 10) rspeak(GO_UNNEEDED); } packed_to_token(command.wd1, word1); - defn = get_vocab_id(word1); + long defn; + enum wordtype type; + get_vocab_metadata(word1, &defn, &type); if (defn == WORD_NOT_FOUND) { if (fallback_handler(command)) continue; @@ -1155,27 +1153,26 @@ Lookup: sspeak(DONT_KNOW, command.raw1); goto Lclearobj; } - /* FIXME: magic numbers related to vocabulary */ - kmod = MOD(defn, 1000); - switch (defn / 1000) { - case 0: - playermove(kmod); + switch (type) { + case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing + case MOTION: + playermove(defn); return true; - case 1: + case OBJECT: command.part = unknown; - command.obj = kmod; + command.obj = defn; break; - case 2: + case ACTION: command.part = intransitive; - command.verb = kmod; + command.verb = defn; break; - case 3: - speak(specials[kmod].message); + case SPECIAL: + speak(specials[defn].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; @@ -1201,7 +1198,7 @@ Lookup: command.raw1[0] = toupper(command.raw1[0]); sspeak(DO_WHAT, command.raw1); command.obj = 0; - // Fallthrough + // Fallthrough case GO_CHECKHINT: // Fallthrough case GO_CLEAROBJ: goto Lclearobj;