#include "advent.h"
#include "dungeon.h"
-static int fill(token_t, token_t);
+static int fill(verb_t, obj_t);
static int attack(struct command_t *command)
/* Attack. Assume target if unambiguous. "Throw" also links here.
* dwarf, etc.) and others (bird, clam, machine). Ambiguous if 2
* enemies, or no enemies but 2 others. */
{
- vocab_t verb = command->verb;
+ verb_t verb = command->verb;
obj_t obj = command->obj;
if (obj == INTRANSITIVE) {
move(DRAGON, LOC_SECRET5);
move(RUG, LOC_SECRET5);
drop(BLOOD, LOC_SECRET5);
- for (obj = 1; obj <= NOBJECTS; obj++) {
- if (game.place[obj] == objects[DRAGON].plac ||
- game.place[obj] == objects[DRAGON].fixd)
- move(obj, LOC_SECRET5);
+ for (obj_t i = 1; i <= NOBJECTS; i++) {
+ if (game.place[i] == objects[DRAGON].plac ||
+ game.place[i] == objects[DRAGON].fixd)
+ move(i, LOC_SECRET5);
}
game.loc = LOC_SECRET5;
return GO_MOVE;
* crossing. */
if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
game.prop[TROLL] = TROLL_PAIDONCE;
- int k = EGGS_DONE;
+ int k;
if (HERE(EGGS))
k = EGGS_VANISHED;
- if (game.loc == objects[EGGS].plac)
+ else if (game.loc == objects[EGGS].plac)
k = EGGS_HERE;
+ else
+ k = EGGS_DONE;
move(EGGS, objects[EGGS].plac);
pspeak(EGGS, look, k, true);
return GO_CLEAROBJ;
}
}
-static int vbreak(vocab_t verb, obj_t obj)
+static int vbreak(verb_t verb, obj_t obj)
/* Break. Only works for mirror in repository and, of course, the vase. */
{
- if (obj == MIRROR) {
+ switch (obj) {
+ case MIRROR:
if (game.closed) {
rspeak(BREAK_MIRROR);
return GO_DWARFWAKE;
} else {
rspeak(TOO_FAR);
- return GO_CLEAROBJ;
+ break;
}
+ case VASE:
+ if (game.prop[VASE] == VASE_WHOLE) {
+ if (TOTING(VASE))
+ drop(VASE, game.loc);
+ state_change(VASE, VASE_BROKEN);
+ game.fixed[VASE] = IS_FIXED;
+ break;
+ }
+ default:
+ speak(actions[verb].message);
}
- if (obj == VASE && game.prop[VASE] == VASE_WHOLE) {
- if (TOTING(VASE))
- drop(VASE, game.loc);
- state_change(VASE, VASE_BROKEN);
- game.fixed[VASE] = IS_FIXED;
- return GO_CLEAROBJ;
- }
- speak(actions[verb].message);
return (GO_CLEAROBJ);
}
return GO_CLEAROBJ;
}
-static int vcarry(token_t verb, obj_t obj)
+static int 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. */
{
if (obj == INTRANSITIVE) {
/* Carry, no object given yet. OK if only one object present. */
- if (game.atloc[game.loc] == 0 ||
+ if (game.atloc[game.loc] == NO_OBJECT ||
game.link[game.atloc[game.loc]] != 0 ||
atdwrf(game.loc) > 0)
return GO_UNKNOWN;
}
if (TOTING(obj)) {
- rspeak(ALREADY_CARRYING);
+ speak(actions[verb].message);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
-static int chain(token_t verb)
+static int chain(verb_t verb)
/* Do something to the bear's chain */
{
if (verb != LOCK) {
switch (game.prop[BEAR]) {
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. */
game.fixed[BEAR] = IS_FIXED;
break;
+ // LCOV_EXCL_END
default:
game.fixed[BEAR] = IS_FREE;
}
return GO_CLEAROBJ;
}
-static int discard(token_t verb, obj_t obj)
+static int 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. */
game.prop[CAVITY] = CAVITY_FULL;
if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) ||
(obj == RUBY && game.prop[RUG] == RUG_HOVER))) {
- int spk = RUG_RISES;
- if (TOTING(RUG))
- spk = RUG_WIGGLES;
+ int spk;
if (obj == RUBY)
spk = RUG_SETTLES;
+ else if (TOTING(RUG))
+ spk = RUG_WIGGLES;
+ else
+ spk = RUG_RISES;
rspeak(spk);
if (spk != RUG_WIGGLES) {
int k = (game.prop[RUG] == RUG_HOVER) ? RUG_FLOOR : RUG_HOVER;
return GO_CLEAROBJ;
}
-static int drink(token_t verb, obj_t obj)
+static int 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. */
{
return GO_CLEAROBJ;
}
-static int eat(token_t verb, obj_t obj)
+static int 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. */
{
return GO_CLEAROBJ;
}
-static int extinguish(token_t verb, obj_t obj)
+static int extinguish(verb_t verb, obj_t obj)
/* Extinguish. Lamp, urn, dragon/volcano (nice try). */
{
if (obj == INTRANSITIVE) {
return GO_CLEAROBJ;
}
-static int feed(token_t verb, obj_t obj)
+static int feed(verb_t verb, obj_t obj)
/* Feed. If bird, no seed. Snake, dragon, troll: quip. If dwarf, make him
* mad. Bear, special. */
{
return GO_CLEAROBJ;
}
-int fill(token_t verb, obj_t obj)
+int fill(verb_t verb, obj_t obj)
/* Fill. Bottle or urn must be empty, and liquid available. (Vase
* is nasty.) */
{
return GO_CLEAROBJ;
}
-static int find(token_t verb, obj_t obj)
+static int find(verb_t verb, obj_t obj)
/* Find. Might be carrying it, or it might be here. Else give caveat. */
{
if (TOTING(obj)) {
return GO_CLEAROBJ;
}
-static int fly(token_t verb, obj_t obj)
+static int fly(verb_t verb, obj_t obj)
/* Fly. Snide remarks unless hovering rug is here. */
{
if (obj == INTRANSITIVE) {
return GO_CLEAROBJ;
}
-static int light(token_t verb, obj_t obj)
+static int light(verb_t verb, obj_t obj)
/* Light. Applicable only to lamp and urn. */
{
if (obj == INTRANSITIVE) {
return GO_CLEAROBJ;
}
-static int lock(token_t verb, obj_t obj)
+static int lock(verb_t verb, obj_t obj)
/* Lock, unlock, no object given. Assume various things if present. */
{
if (obj == INTRANSITIVE) {
return GO_CLEAROBJ;
}
-static int pour(token_t verb, obj_t obj)
+static int 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. */
{
}
}
-static int rub(token_t verb, obj_t obj)
+static int rub(verb_t verb, obj_t obj)
/* Rub. Yields various snide remarks except for lit urn. */
{
if (obj == URN && game.prop[URN] == URN_LIT) {
{
if (command->wd2 > 0) {
command->wd1 = command->wd2;
- strcpy(command->raw1, command->raw2);
+ strncpy(command->raw1, command->raw2, LINESIZE - 1);
}
char word1[TOKLEN + 1];
packed_to_token(command->wd1, word1);
}
}
-static int wake(token_t verb, obj_t obj)
+static int wake(verb_t verb, obj_t obj)
/* Wake. Only use is to disturb the dwarves. */
{
if (obj != DWARF ||
}
}
-static int wave(token_t verb, obj_t obj)
+static int wave(verb_t verb, obj_t obj)
/* Wave. No effect unless waving rod at fissure or at bird. */
{
if (obj != ROD ||
projects / open-adventure.git / blobdiff