* 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())
- {
- speak(arbitrary_messages[NASTY_DRAGON]);
- return GO_MOVE;
- }
+ if (!silent_yes()) {
+ speak(arbitrary_messages[NASTY_DRAGON]);
+ return GO_MOVE;
+ }
state_change(DRAGON, DRAGON_DEAD);
game.prop[RUG] = RUG_FLOOR;
/* Hardcoding LOC_SECRET5 as the dragon's death location is ugly.
return GO_CLEAROBJ;
}
-static int bigwords(long id)
+static int 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). */
* 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 {
switch (obj) {
case MIRROR:
if (game.closed) {
- rspeak(BREAK_MIRROR);
+ state_change(MIRROR, MIRROR_BROKEN);
return GO_DWARFWAKE;
} else {
rspeak(TOO_FAR);
game.fixed[VASE] = IS_FIXED;
break;
}
+ /* FALLTHRU */
default:
speak(actions[verb].message);
}
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. */
} 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;
}
case INTRANSITIVE:
if (!HERE(FOOD))
return GO_UNKNOWN;
+ /* FALLTHRU */
case FOOD:
DESTROY(FOOD);
rspeak(THANKS_DELICIOUS);
static int 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)
* 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, mi, true, game.zzword);
rspeak(NO_MESSAGE);
if (i == BIRD && mi == BIRD_ENDSTATE)
DESTROY(BIRD);
case OYSTER:
if (verb == LOCK)
rspeak(HUH_MAN);
- else if (TOTING(OYSTER))
- rspeak(DROP_OYSTER);
+ else if (TOTING(OYSTER))
+ rspeak(DROP_OYSTER);
else if (!TOTING(TRIDENT))
rspeak(OYSTER_OPENER);
- else
- rspeak(OYSTER_OPENS);
+ else
+ rspeak(OYSTER_OPENS);
break;
case DOOR:
rspeak((game.prop[DOOR] == DOOR_UNRUSTED) ? OK_MAN : RUSTY_DOOR);
}
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);
- 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->type2 == MOTION &&
+ (command->id2 == XYZZY ||
+ command->id2 == PLUGH ||
+ command->id2 == PLOVER)) {
+ return GO_WORD2;
+ }
+ if (command->type2 == ACTION &&
+ (command->id2 == FEE ||
+ command->id2 == FIE ||
+ command->id2 == FOE ||
+ command->id2 == FOO ||
+ command->id2 == FUM ||
+ command->id2 == PART)) {
+ return GO_WORD2;
+ }
+ sspeak(OKEY_DOKEY, command->raw2);
return GO_CLEAROBJ;
}
-static int throw_support(long spk)
+static int throw_support(vocab_t spk)
{
rspeak(spk);
drop(AXE, game.loc);
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) ?
* location. */
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))
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). */
return listen();
case PART:
return reservoir();
- default:
+ default: // LCOV_EXCL_LINE
BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
}
}
}
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
}
}
projects / open-adventure.git / blobdiff