X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=5433a7dad1c0839b90e09f4b2264a66302d64784;hp=be822c8083493c44c4201c29933620fd9e3eb632;hb=08c40bc9993ce5684077b9ceac492e4fb642a722;hpb=7f18e668667b27df699fd04cf1c576f183028432 diff --git a/actions.c b/actions.c index be822c8..5433a7d 100644 --- a/actions.c +++ b/actions.c @@ -101,13 +101,9 @@ static int attack(struct command_t *command) * fixed), move rug there (not fixed), and move him there, * too. Then do a null motion to get new description. */ rspeak(BARE_HANDS_QUERY); - if (silent_yes()) { - // FIXME: setting wd1 is a workaround for broken logic - command->wd1 = token_to_packed("Y"); - } else { - // FIXME: setting wd1 is a workaround for broken logic - command->wd1 = token_to_packed("N"); - return GO_CHECKFOO; + if (!silent_yes()) { + speak(arbitrary_messages[NASTY_DRAGON]); + return GO_MOVE; } state_change(DRAGON, DRAGON_DEAD); game.prop[RUG] = RUG_FLOOR; @@ -205,15 +201,14 @@ static int bigwords(long id) * crossing. */ if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID) game.prop[TROLL] = TROLL_PAIDONCE; - int k; if (HERE(EGGS)) - k = EGGS_VANISHED; + pspeak(EGGS, look, EGGS_VANISHED, true); else if (game.loc == objects[EGGS].plac) - k = EGGS_HERE; + pspeak(EGGS, look, EGGS_HERE, true); else - k = EGGS_DONE; + pspeak(EGGS, look, EGGS_DONE, true); move(EGGS, objects[EGGS].plac); - pspeak(EGGS, look, k, true); + return GO_CLEAROBJ; } } else { @@ -256,7 +251,7 @@ static int vbreak(verb_t verb, obj_t obj) switch (obj) { case MIRROR: if (game.closed) { - rspeak(BREAK_MIRROR); + state_change(MIRROR, MIRROR_BROKEN); return GO_DWARFWAKE; } else { rspeak(TOO_FAR); @@ -270,6 +265,7 @@ static int vbreak(verb_t verb, obj_t obj) game.fixed[VASE] = IS_FIXED; break; } + /* FALLTHRU */ default: speak(actions[verb].message); } @@ -420,8 +416,8 @@ static int chain(verb_t verb) game.prop[BEAR] = CONTENTED_BEAR; switch (game.prop[BEAR]) { + // LCOV_EXCL_START case BEAR_DEAD: - // LCOV_EXCL_START /* Can't be reached as long as the only way for the bear to die * is from a bridge collapse. Leave in in case this changes, but * exclude from coverage testing. */ @@ -548,9 +544,7 @@ static int discard(verb_t verb, obj_t obj) } else rspeak(OK_MAN); - game.prop[BIRD] = BIRD_UNCAGED; - if (FOREST(game.loc)) - game.prop[BIRD] = BIRD_FOREST_UNCAGED; + game.prop[BIRD] = FOREST(game.loc) ? BIRD_FOREST_UNCAGED : BIRD_UNCAGED; drop(obj, game.loc); return GO_CLEAROBJ; } @@ -598,6 +592,7 @@ static int eat(verb_t verb, obj_t obj) case INTRANSITIVE: if (!HERE(FOOD)) return GO_UNKNOWN; + /* FALLTHRU */ case FOOD: DESTROY(FOOD); rspeak(THANKS_DELICIOUS); @@ -995,7 +990,7 @@ static int lock(verb_t verb, obj_t obj) if (verb == LOCK) rspeak(HUH_MAN); else if (!TOTING(TRIDENT)) - rspeak(OYSTER_OPENER); + rspeak(CLAM_OPENER); else { DESTROY(CLAM); drop(OYSTER, game.loc); @@ -1006,8 +1001,12 @@ static int lock(verb_t verb, obj_t obj) case OYSTER: if (verb == LOCK) rspeak(HUH_MAN); - else + else if (TOTING(OYSTER)) + rspeak(DROP_OYSTER); + else if (!TOTING(TRIDENT)) rspeak(OYSTER_OPENER); + else + rspeak(OYSTER_OPENS); break; case DOOR: rspeak((game.prop[DOOR] == DOOR_UNRUSTED) ? OK_MAN : RUSTY_DOOR); @@ -1144,17 +1143,11 @@ static int rub(verb_t verb, obj_t obj) } static int say(struct command_t *command) -/* Say. Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).) Magic words override. */ +/* Say. Echo WD2. Magic words override. */ { - if (command->wd2 > 0) { - command->wd1 = command->wd2; - strncpy(command->raw1, command->raw2, LINESIZE - 1); - } - char word1[TOKLEN + 1]; - packed_to_token(command->wd1, word1); long wd; enum wordtype type; - get_vocab_metadata(word1, &wd, &type); + get_vocab_metadata(command->raw2, &wd, &type); if (wd == XYZZY || wd == PLUGH || wd == PLOVER || @@ -1164,11 +1157,9 @@ static int say(struct command_t *command) wd == FOO || wd == FUM || wd == PART) { - /* FIXME: scribbles on the interpreter's command block */ - wordclear(&command->wd2); - return GO_LOOKUP; + return GO_WORD2; } - sspeak(OKEY_DOKEY, command->raw1); + sspeak(OKEY_DOKEY, command->raw2); return GO_CLEAROBJ; } @@ -1318,14 +1309,14 @@ int action(struct command_t *command) if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT) { - command->obj = DPRSSN; + command->obj = DEPRESSION; } if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD || game.loc == LOC_BIRD || game.loc == LOC_PITTOP) { - command->obj = ENTRNC; + command->obj = ENTRANCE; } } else if (command->obj == DWARF && atdwrf(game.loc) > 0) /* FALL THROUGH */; @@ -1346,14 +1337,14 @@ int action(struct command_t *command) command->obj = ROD2; /* FALL THROUGH */; } else if ((command->verb == FIND || - command->verb == INVENTORY) && command->wd2 <= 0) + command->verb == INVENTORY) && (command->id2 == WORD_EMPTY || command->id2 == WORD_NOT_FOUND)) /* FALL THROUGH */; else { sspeak(NO_SEE, command->raw1); return GO_CLEAROBJ; } - if (command->wd2 > 0) + if (command->id2 != WORD_EMPTY && command->id2 != WORD_NOT_FOUND) return GO_WORD2; if (command->verb != 0) command->part = transitive; @@ -1361,10 +1352,13 @@ int action(struct command_t *command) switch (command->part) { case intransitive: - if (command->wd2 > 0 && command->verb != SAY) + if (command->raw2[0] != '\0' && command->verb != SAY) return GO_WORD2; if (command->verb == SAY) - command->obj = command->wd2; + /* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE + * will do here. We're preventing interpretation as an intransitive + * verb when the word is unknown. */ + command->obj = command->raw2[0] != '\0' ? KEYS : NO_OBJECT; if (command->obj == NO_OBJECT || command->obj == INTRANSITIVE) { /* Analyse an intransitive verb (ie, no object given yet). */ @@ -1449,7 +1443,7 @@ int action(struct command_t *command) return listen(); case PART: return reservoir(); - default: + default: // LCOV_EXCL_LINE BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE } } @@ -1550,14 +1544,14 @@ int action(struct command_t *command) } case PART: return reservoir(); - default: + default: // LCOV_EXCL_LINE BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE } case unknown: /* Unknown verb, couldn't deduce object - might need hint */ sspeak(WHAT_DO, command->raw1); return GO_CHECKHINT; - default: + default: // LCOV_EXCL_LINE BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE } }