X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=5460848f95a93d7c10fa3f80fe82d8032eae251c;hp=be822c8083493c44c4201c29933620fd9e3eb632;hb=e7dc3eab5d7eb798199e59081e846582af7205a7;hpb=7f18e668667b27df699fd04cf1c576f183028432 diff --git a/actions.c b/actions.c index be822c8..5460848 100644 --- a/actions.c +++ b/actions.c @@ -1,19 +1,28 @@ +/* + * Actions for the duneon-running code. + * + * Copyright (c) 1977, 2005 by Will Crowther and Don Woods + * Copyright (c) 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-clause + */ + #include #include #include #include "advent.h" #include "dungeon.h" +#include -static int fill(verb_t, obj_t); +static phase_codes_t fill(verb_t, obj_t); -static int attack(struct command_t *command) +static phase_codes_t attack(command_t command) /* Attack. Assume target if unambiguous. "Throw" also links here. * Attackable objects fall into two categories: enemies (snake, * dwarf, etc.) and others (bird, clam, machine). Ambiguous if 2 * enemies, or no enemies but 2 others. */ { - verb_t verb = command->verb; - obj_t obj = command->obj; + verb_t verb = command.verb; + obj_t obj = command.obj; if (obj == INTRANSITIVE) { int changes = 0; @@ -75,6 +84,7 @@ static int attack(struct command_t *command) if (obj == VEND) { state_change(VEND, game.prop[VEND] == VEND_BLOCKS ? VEND_UNBLOCKS : VEND_BLOCKS); + return GO_CLEAROBJ; } @@ -101,13 +111,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; @@ -180,7 +186,7 @@ static int attack(struct command_t *command) return GO_CLEAROBJ; } -static int bigwords(long id) +static phase_codes_t bigwords(vocab_t id) /* FEE FIE FOE FOO (AND FUM). Advance to next state if given in proper order. * Look up foo in special section of vocab to determine which word we've got. * Last word zips the eggs back to the giant room (unless already there). */ @@ -205,15 +211,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, true, EGGS_VANISHED); else if (game.loc == objects[EGGS].plac) - k = EGGS_HERE; + pspeak(EGGS, look, true, EGGS_HERE); else - k = EGGS_DONE; + pspeak(EGGS, look, true, EGGS_DONE); move(EGGS, objects[EGGS].plac); - pspeak(EGGS, look, k, true); + return GO_CLEAROBJ; } } else { @@ -250,13 +255,13 @@ static void blast(void) } } -static int vbreak(verb_t verb, obj_t obj) +static phase_codes_t vbreak(verb_t verb, obj_t obj) /* Break. Only works for mirror in repository and, of course, the vase. */ { switch (obj) { case MIRROR: if (game.closed) { - rspeak(BREAK_MIRROR); + state_change(MIRROR, MIRROR_BROKEN); return GO_DWARFWAKE; } else { rspeak(TOO_FAR); @@ -270,14 +275,15 @@ static int vbreak(verb_t verb, obj_t obj) game.fixed[VASE] = IS_FIXED; break; } + /* FALLTHRU */ default: speak(actions[verb].message); } return (GO_CLEAROBJ); } -static int brief(void) -/* Brief. Intransitive only. Suppress long descriptions after first time. */ +static phase_codes_t brief(void) +/* Brief. Intransitive only. Suppress full descriptions after first time. */ { game.abbnum = 10000; game.detail = 3; @@ -285,7 +291,7 @@ static int brief(void) return GO_CLEAROBJ; } -static int vcarry(verb_t verb, obj_t obj) +static phase_codes_t vcarry(verb_t verb, obj_t obj) /* Carry an object. Special cases for bird and cage (if bird in cage, can't * take one without the other). Liquids also special, since they depend on * status of bottle. Also various side effects, etc. */ @@ -420,10 +426,10 @@ 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 + /* Can't be reached until the bear can die in some way other + * than a bridge collapse. Leave in in case this changes, but * exclude from coverage testing. */ game.fixed[BEAR] = IS_FIXED; break; @@ -454,7 +460,7 @@ static int chain(verb_t verb) return GO_CLEAROBJ; } -static int discard(verb_t verb, obj_t obj) +static phase_codes_t discard(verb_t verb, obj_t obj) /* Discard object. "Throw" also comes here for most objects. Special cases for * bird (might attack snake or dragon) and cage (might contain bird) and vase. * Drop coins at vending machine for extra batteries. */ @@ -495,7 +501,7 @@ static int discard(verb_t verb, obj_t obj) if (obj == COINS && HERE(VEND)) { DESTROY(COINS); drop(BATTERY, game.loc); - pspeak(BATTERY, look, FRESH_BATTERIES, true); + pspeak(BATTERY, look, true, FRESH_BATTERIES); return GO_CLEAROBJ; } @@ -548,9 +554,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; } @@ -560,7 +564,7 @@ static int discard(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int drink(verb_t verb, obj_t obj) +static phase_codes_t drink(verb_t verb, obj_t obj) /* Drink. If no object, assume water and look for it here. If water is in * the bottle, drink that, else must be at a water loc, so drink stream. */ { @@ -590,7 +594,7 @@ static int drink(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int eat(verb_t verb, obj_t obj) +static phase_codes_t eat(verb_t verb, obj_t obj) /* Eat. Intransitive: assume food if present, else ask what. Transitive: food * ok, some things lose appetite, rest are ridiculous. */ { @@ -598,6 +602,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); @@ -619,7 +624,7 @@ static int eat(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int extinguish(verb_t verb, obj_t obj) +static phase_codes_t extinguish(verb_t verb, obj_t obj) /* Extinguish. Lamp, urn, dragon/volcano (nice try). */ { if (obj == INTRANSITIVE) { @@ -636,7 +641,7 @@ static int extinguish(verb_t verb, obj_t obj) if (game.prop[URN] != URN_EMPTY) { state_change(URN, URN_DARK); } else { - pspeak(URN, change, URN_DARK, true); + pspeak(URN, change, true, URN_DARK); } break; case LAMP: @@ -655,7 +660,7 @@ static int extinguish(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int feed(verb_t verb, obj_t obj) +static phase_codes_t feed(verb_t verb, obj_t obj) /* Feed. If bird, no seed. Snake, dragon, troll: quip. If dwarf, make him * mad. Bear, special. */ { @@ -715,7 +720,7 @@ static int feed(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -int fill(verb_t verb, obj_t obj) +phase_codes_t fill(verb_t verb, obj_t obj) /* Fill. Bottle or urn must be empty, and liquid available. (Vase * is nasty.) */ { @@ -791,7 +796,7 @@ int fill(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int find(verb_t verb, obj_t obj) +static phase_codes_t find(verb_t verb, obj_t obj) /* Find. Might be carrying it, or it might be here. Else give caveat. */ { if (TOTING(obj)) { @@ -817,7 +822,7 @@ static int find(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int fly(verb_t verb, obj_t obj) +static phase_codes_t fly(verb_t verb, obj_t obj) /* Fly. Snide remarks unless hovering rug is here. */ { if (obj == INTRANSITIVE) { @@ -853,7 +858,7 @@ static int fly(verb_t verb, obj_t obj) return GO_TERMINATE; } -static int inven(void) +static phase_codes_t inven(void) /* Inventory. If object, treat same as find. Else report on current burden. */ { bool empty = true; @@ -865,7 +870,7 @@ static int inven(void) rspeak(NOW_HOLDING); empty = false; } - pspeak(i, touch, -1, false); + pspeak(i, touch, false, -1); } if (TOTING(BEAR)) rspeak(TAME_BEAR); @@ -874,7 +879,7 @@ static int inven(void) return GO_CLEAROBJ; } -static int light(verb_t verb, obj_t obj) +static phase_codes_t light(verb_t verb, obj_t obj) /* Light. Applicable only to lamp and urn. */ { if (obj == INTRANSITIVE) { @@ -912,10 +917,10 @@ static int light(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int listen(void) +static phase_codes_t listen(void) /* Listen. Intransitive only. Print stuff based on object sound proprties. */ { - long sound = locations[game.loc].sound; + vocab_t sound = locations[game.loc].sound; if (sound != SILENT) { rspeak(sound); if (!locations[game.loc].loud) @@ -935,8 +940,7 @@ static int listen(void) * depending on whether player has drunk dragon's blood. */ if (i == BIRD) mi += 3 * game.blooded; - long packed_zzword = token_to_packed(game.zzword); - pspeak(i, hear, mi, true, packed_zzword); + pspeak(i, hear, true, mi, game.zzword); rspeak(NO_MESSAGE); if (i == BIRD && mi == BIRD_ENDSTATE) DESTROY(BIRD); @@ -946,7 +950,7 @@ static int listen(void) return GO_CLEAROBJ; } -static int lock(verb_t verb, obj_t obj) +static phase_codes_t lock(verb_t verb, obj_t obj) /* Lock, unlock, no object given. Assume various things if present. */ { if (obj == INTRANSITIVE) { @@ -995,7 +999,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 +1010,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); @@ -1025,7 +1033,7 @@ static int lock(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int pour(verb_t verb, obj_t obj) +static phase_codes_t pour(verb_t verb, obj_t obj) /* Pour. If no object, or object is bottle, assume contents of bottle. * special tests for pouring water or oil on plant or rusty door. */ { @@ -1070,7 +1078,7 @@ static int pour(verb_t verb, obj_t obj) } } -static int quit(void) +static phase_codes_t quit(void) /* Quit. Intransitive only. Verify intent and exit if that's what he wants. */ { if (yes(arbitrary_messages[REALLY_QUIT], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) @@ -1078,7 +1086,7 @@ static int quit(void) return GO_CLEAROBJ; } -static int read(struct command_t command) +static phase_codes_t read(command_t command) /* Read. Print stuff based on objtxt. Oyster (?) is special case. */ { if (command.obj == INTRANSITIVE) { @@ -1094,18 +1102,18 @@ static int read(struct command_t command) } if (DARK(game.loc)) { - sspeak(NO_SEE, command.raw1); + sspeak(NO_SEE, command.word[0].raw); } else if (command.obj == OYSTER && !game.clshnt && game.closed) { game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]); } else if (objects[command.obj].texts[0] == NULL || game.prop[command.obj] == STATE_NOTFOUND) { speak(actions[command.verb].message); } else - pspeak(command.obj, study, game.prop[command.obj], true); + pspeak(command.obj, study, true, game.prop[command.obj]); return GO_CLEAROBJ; } -static int reservoir(void) +static phase_codes_t reservoir(void) /* Z'ZZZ (word gets recomputed at startup; different each game). */ { if (!AT(RESER) && game.loc != LOC_RESBOTTOM) { @@ -1125,7 +1133,7 @@ static int reservoir(void) } } -static int rub(verb_t verb, obj_t obj) +static phase_codes_t rub(verb_t verb, obj_t obj) /* Rub. Yields various snide remarks except for lit urn. */ { if (obj == URN && game.prop[URN] == URN_LIT) { @@ -1143,55 +1151,51 @@ static int rub(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int say(struct command_t *command) -/* Say. Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).) Magic words override. */ +static phase_codes_t say(command_t command) +/* 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); - if (wd == XYZZY || - wd == PLUGH || - wd == PLOVER || - wd == FEE || - wd == FIE || - wd == FOE || - wd == FOO || - wd == FUM || - wd == PART) { - /* FIXME: scribbles on the interpreter's command block */ - wordclear(&command->wd2); - return GO_LOOKUP; - } - sspeak(OKEY_DOKEY, command->raw1); + if (command.word[1].type == MOTION && + (command.word[1].id == XYZZY || + command.word[1].id == PLUGH || + command.word[1].id == PLOVER)) { + return GO_WORD2; + } + if (command.word[1].type == ACTION && command.word[1].id == PART) + return reservoir(); + + if (command.word[1].type == ACTION && + (command.word[1].id == FEE || + command.word[1].id == FIE || + command.word[1].id == FOE || + command.word[1].id == FOO || + command.word[1].id == FUM || + command.word[1].id == PART)) { + return bigwords(command.word[1].id); + } + sspeak(OKEY_DOKEY, command.word[1].raw); return GO_CLEAROBJ; } -static int throw_support(long spk) +static phase_codes_t throw_support(vocab_t spk) { rspeak(spk); drop(AXE, game.loc); return GO_MOVE; } -static int throw (struct command_t *command) +static phase_codes_t throw (command_t command) /* Throw. Same as discard unless axe. Then same as attack except * ignore bird, and if dwarf is present then one might be killed. * (Only way to do so!) Axe also special for dragon, bear, and * troll. Treasures special for troll. */ { - if (!TOTING(command->obj)) { - speak(actions[command->verb].message); + if (!TOTING(command.obj)) { + speak(actions[command.verb].message); return GO_CLEAROBJ; } - if (objects[command->obj].is_treasure && AT(TROLL)) { + if (objects[command.obj].is_treasure && AT(TROLL)) { /* Snarf a treasure for the troll. */ - drop(command->obj, LOC_NOWHERE); + drop(command.obj, LOC_NOWHERE); move(TROLL, LOC_NOWHERE); move(TROLL + NOBJECTS, IS_FREE); drop(TROLL2, objects[TROLL].plac); @@ -1200,13 +1204,13 @@ static int throw (struct command_t *command) rspeak(TROLL_SATISFIED); return GO_CLEAROBJ; } - if (command->obj == FOOD && HERE(BEAR)) { + if (command.obj == FOOD && HERE(BEAR)) { /* But throwing food is another story. */ - command->obj = BEAR; - return (feed(command->verb, command->obj)); + command.obj = BEAR; + return (feed(command.verb, command.obj)); } - if (command->obj != AXE) - return (discard(command->verb, command->obj)); + if (command.obj != AXE) + return (discard(command.verb, command.obj)); else { if (atdwrf(game.loc) <= 0) { if (AT(DRAGON) && game.prop[DRAGON] == DRAGON_BARS) @@ -1223,14 +1227,14 @@ static int throw (struct command_t *command) state_change(AXE, AXE_LOST); return GO_CLEAROBJ; } - command->obj = INTRANSITIVE; + command.obj = INTRANSITIVE; return (attack(command)); } if (randrange(NDWARVES + 1) < game.dflag) { return throw_support(DWARF_DODGES); } else { - long i = atdwrf(game.loc); + int i = atdwrf(game.loc); game.dseen[i] = false; game.dloc[i] = LOC_NOWHERE; return throw_support((++game.dkill == 1) ? @@ -1240,7 +1244,7 @@ static int throw (struct command_t *command) } } -static int wake(verb_t verb, obj_t obj) +static phase_codes_t wake(verb_t verb, obj_t obj) /* Wake. Only use is to disturb the dwarves. */ { if (obj != DWARF || @@ -1253,7 +1257,25 @@ static int wake(verb_t verb, obj_t obj) } } -static int wave(verb_t verb, obj_t obj) +static phase_codes_t seed(verb_t verb, const char *arg) +/* Set seed */ +{ + int32_t seed = strtol(arg, NULL, 10); + speak(actions[verb].message, seed); + set_seed(seed); + --game.turns; + return GO_TOP; +} + +static phase_codes_t waste(verb_t verb, turn_t turns) +/* Burn turns */ +{ + game.limit -= turns; + speak(actions[verb].message, (int)game.limit); + return GO_TOP; +} + +static phase_codes_t wave(verb_t verb, obj_t obj) /* Wave. No effect unless waving rod at fissure or at bird. */ { if (obj != ROD || @@ -1299,12 +1321,20 @@ static int wave(verb_t verb, obj_t obj) } } -int action(struct command_t *command) +phase_codes_t action(command_t command) /* Analyse a verb. Remember what it was, go back for object if second word * unless verb is "say", which snarfs arbitrary second word. */ { - if (command->part == unknown) { + /* Previously, actions that result in a message, but don't do anything + * further were called "specials". Now they're handled here as normal + * actions. If noaction is true, then we spit out the message and return */ + if (actions[command.verb].noaction) { + speak(actions[command.verb].message); + return GO_CLEAROBJ; + } + + if (command.part == unknown) { /* Analyse an object word. See if the thing is here, whether * we've got a verb yet, and so on. Object must be here * unless verb is "find" or "invent(ory)" (and no new verb @@ -1312,98 +1342,86 @@ int action(struct command_t *command) * they are never actually dropped at any location, but might * be here inside the bottle or urn or as a feature of the * location. */ - if (HERE(command->obj)) + if (HERE(command.obj)) /* FALL THROUGH */; - else if (command->obj == GRATE) { - if (game.loc == LOC_START || - game.loc == LOC_VALLEY || - game.loc == LOC_SLIT) { - command->obj = DPRSSN; - } - if (game.loc == LOC_COBBLE || - game.loc == LOC_DEBRIS || - game.loc == LOC_AWKWARD || - game.loc == LOC_BIRD || - game.loc == LOC_PITTOP) { - command->obj = ENTRNC; - } - } else if (command->obj == DWARF && atdwrf(game.loc) > 0) + else if (command.obj == DWARF && atdwrf(game.loc) > 0) /* FALL THROUGH */; - else if ((LIQUID() == command->obj && HERE(BOTTLE)) || - command->obj == LIQLOC(game.loc)) + else if ((LIQUID() == command.obj && HERE(BOTTLE)) || + command.obj == LIQLOC(game.loc)) /* FALL THROUGH */; - else if (command->obj == OIL && HERE(URN) && game.prop[URN] != URN_EMPTY) { - command->obj = URN; + else if (command.obj == OIL && HERE(URN) && game.prop[URN] != URN_EMPTY) { + command.obj = URN; /* FALL THROUGH */; - } else if (command->obj == PLANT && AT(PLANT2) && game.prop[PLANT2] != PLANT_THIRSTY) { - command->obj = PLANT2; + } else if (command.obj == PLANT && AT(PLANT2) && game.prop[PLANT2] != PLANT_THIRSTY) { + command.obj = PLANT2; /* FALL THROUGH */; - } else if (command->obj == KNIFE && game.knfloc == game.loc) { + } else if (command.obj == KNIFE && game.knfloc == game.loc) { game.knfloc = -1; rspeak(KNIVES_VANISH); return GO_CLEAROBJ; - } else if (command->obj == ROD && HERE(ROD2)) { - command->obj = ROD2; + } else if (command.obj == ROD && HERE(ROD2)) { + command.obj = ROD2; /* FALL THROUGH */; - } else if ((command->verb == FIND || - command->verb == INVENTORY) && command->wd2 <= 0) + } else if ((command.verb == FIND || + command.verb == INVENTORY) && (command.word[1].id == WORD_EMPTY || command.word[1].id == WORD_NOT_FOUND)) /* FALL THROUGH */; else { - sspeak(NO_SEE, command->raw1); + sspeak(NO_SEE, command.word[0].raw); return GO_CLEAROBJ; } - if (command->wd2 > 0) - return GO_WORD2; - if (command->verb != 0) - command->part = transitive; + if (command.verb != 0) + command.part = transitive; } - switch (command->part) { + switch (command.part) { case intransitive: - if (command->wd2 > 0 && command->verb != SAY) + if (command.word[1].raw[0] != '\0' && command.verb != SAY) return GO_WORD2; - if (command->verb == SAY) - command->obj = command->wd2; - if (command->obj == NO_OBJECT || - command->obj == INTRANSITIVE) { + if (command.verb == SAY) + /* 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.word[1].raw[0] != '\0' ? KEYS : NO_OBJECT; + if (command.obj == NO_OBJECT || + command.obj == INTRANSITIVE) { /* Analyse an intransitive verb (ie, no object given yet). */ - switch (command->verb) { + switch (command.verb) { case CARRY: - return vcarry(command->verb, INTRANSITIVE); + return vcarry(command.verb, INTRANSITIVE); case DROP: return GO_UNKNOWN; case SAY: return GO_UNKNOWN; case UNLOCK: - return lock(command->verb, INTRANSITIVE); + return lock(command.verb, INTRANSITIVE); case NOTHING: { rspeak(OK_MAN); return (GO_CLEAROBJ); } case LOCK: - return lock(command->verb, INTRANSITIVE); + return lock(command.verb, INTRANSITIVE); case LIGHT: - return light(command->verb, INTRANSITIVE); + return light(command.verb, INTRANSITIVE); case EXTINGUISH: - return extinguish(command->verb, INTRANSITIVE); + return extinguish(command.verb, INTRANSITIVE); case WAVE: return GO_UNKNOWN; case TAME: return GO_UNKNOWN; case GO: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } case ATTACK: - command->obj = INTRANSITIVE; + command.obj = INTRANSITIVE; return attack(command); case POUR: - return pour(command->verb, INTRANSITIVE); + return pour(command.verb, INTRANSITIVE); case EAT: - return eat(command->verb, INTRANSITIVE); + return eat(command.verb, INTRANSITIVE); case DRINK: - return drink(command->verb, INTRANSITIVE); + return drink(command.verb, INTRANSITIVE); case RUB: return GO_UNKNOWN; case THROW: @@ -1417,7 +1435,7 @@ int action(struct command_t *command) case FEED: return GO_UNKNOWN; case FILL: - return fill(command->verb, INTRANSITIVE); + return fill(command.verb, INTRANSITIVE); case BLAST: blast(); return GO_CLEAROBJ; @@ -1429,12 +1447,12 @@ int action(struct command_t *command) case FOE: case FOO: case FUM: - return bigwords(command->id1); + return bigwords(command.word[0].id); case BRIEF: return brief(); case READ: - command->obj = INTRANSITIVE; - return read(*command); + command.obj = INTRANSITIVE; + return read(command); case BREAK: return GO_UNKNOWN; case WAKE: @@ -1444,76 +1462,80 @@ int action(struct command_t *command) case RESUME: return resume(); case FLY: - return fly(command->verb, INTRANSITIVE); + return fly(command.verb, INTRANSITIVE); case LISTEN: return listen(); case PART: return reservoir(); - default: + case SEED: + case WASTE: + rspeak(NUMERIC_REQUIRED); + return GO_TOP; + default: // LCOV_EXCL_LINE BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE } } /* FALLTHRU */ case transitive: /* Analyse a transitive verb. */ - switch (command->verb) { + switch (command.verb) { case CARRY: - return vcarry(command->verb, command->obj); + return vcarry(command.verb, command.obj); case DROP: - return discard(command->verb, command->obj); + return discard(command.verb, command.obj); case SAY: return say(command); case UNLOCK: - return lock(command->verb, command->obj); + return lock(command.verb, command.obj); case NOTHING: { rspeak(OK_MAN); return (GO_CLEAROBJ); } case LOCK: - return lock(command->verb, command->obj); + return lock(command.verb, command.obj); case LIGHT: - return light(command->verb, command->obj); + return light(command.verb, command.obj); case EXTINGUISH: - return extinguish(command->verb, command->obj); + return extinguish(command.verb, command.obj); case WAVE: - return wave(command->verb, command->obj); + return wave(command.verb, command.obj); case TAME: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } case GO: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } case ATTACK: return attack(command); case POUR: - return pour(command->verb, command->obj); + return pour(command.verb, command.obj); case EAT: - return eat(command->verb, command->obj); + return eat(command.verb, command.obj); case DRINK: - return drink(command->verb, command->obj); + return drink(command.verb, command.obj); case RUB: - return rub(command->verb, command->obj); + return rub(command.verb, command.obj); case THROW: return throw (command); case QUIT: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } case FIND: - return find(command->verb, command->obj); + return find(command.verb, command.obj); case INVENTORY: - return find(command->verb, command->obj); + return find(command.verb, command.obj); case FEED: - return feed(command->verb, command->obj); + return feed(command.verb, command.obj); case FILL: - return fill(command->verb, command->obj); + return fill(command.verb, command.obj); case BLAST: blast(); return GO_CLEAROBJ; case SCORE: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } case FEE: @@ -1521,43 +1543,50 @@ int action(struct command_t *command) case FOE: case FOO: case FUM: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } case BRIEF: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } case READ: - return read(*command); + return read(command); case BREAK: - return vbreak(command->verb, command->obj); + return vbreak(command.verb, command.obj); case WAKE: - return wake(command->verb, command->obj); + return wake(command.verb, command.obj); case SAVE: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } case RESUME: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } case FLY: - return fly(command->verb, command->obj); + return fly(command.verb, command.obj); case LISTEN: { - speak(actions[command->verb].message); + speak(actions[command.verb].message); return GO_CLEAROBJ; } + // LCOV_EXCL_START + // This case should never happen - here only as placeholder case PART: return reservoir(); - default: + // LCOV_EXCL_STOP + case SEED: + return seed(command.verb, command.word[1].raw); + case WASTE: + return waste(command.verb, (turn_t)atol(command.word[1].raw)); + 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); + sspeak(WHAT_DO, command.word[0].raw); return GO_CHECKHINT; - default: + default: // LCOV_EXCL_LINE BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE } }