+/*
+ * 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 <stdlib.h>
#include <stdbool.h>
#include <string.h>
#include "advent.h"
#include "dungeon.h"
+#include <inttypes.h>
-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
if (obj == VEND) {
state_change(VEND,
game.prop[VEND] == VEND_BLOCKS ? VEND_UNBLOCKS : VEND_BLOCKS);
+
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
-static int bigwords(vocab_t 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). */
if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
game.prop[TROLL] = TROLL_PAIDONCE;
if (HERE(EGGS))
- pspeak(EGGS, look, EGGS_VANISHED, true);
+ pspeak(EGGS, look, true, EGGS_VANISHED);
else if (game.loc == objects[EGGS].plac)
- pspeak(EGGS, look, EGGS_HERE, true);
+ pspeak(EGGS, look, true, EGGS_HERE);
else
- pspeak(EGGS, look, EGGS_DONE, true);
+ pspeak(EGGS, look, true, EGGS_DONE);
move(EGGS, objects[EGGS].plac);
return GO_CLEAROBJ;
}
}
-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) {
game.fixed[VASE] = IS_FIXED;
break;
}
- /* FALLTHRU */
+ /* FALLTHRU */
default:
speak(actions[verb].message);
}
return (GO_CLEAROBJ);
}
-static int brief(void)
+static phase_codes_t brief(void)
/* Brief. Intransitive only. Suppress full descriptions after first time. */
{
game.abbnum = 10000;
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. */
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. */
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;
}
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. */
{
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. */
{
case INTRANSITIVE:
if (!HERE(FOOD))
return GO_UNKNOWN;
- /* FALLTHRU */
+ /* FALLTHRU */
case FOOD:
DESTROY(FOOD);
rspeak(THANKS_DELICIOUS);
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) {
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:
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. */
{
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.) */
{
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)) {
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) {
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;
rspeak(NOW_HOLDING);
empty = false;
}
- pspeak(i, touch, -1, false);
+ pspeak(i, touch, false, -1);
}
if (TOTING(BEAR))
rspeak(TAME_BEAR);
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) {
return GO_CLEAROBJ;
}
-static int listen(void)
+static phase_codes_t listen(void)
/* Listen. Intransitive only. Print stuff based on object sound proprties. */
{
vocab_t sound = locations[game.loc].sound;
* depending on whether player has drunk dragon's blood. */
if (i == BIRD)
mi += 3 * game.blooded;
- pspeak(i, hear, mi, true, game.zzword);
+ pspeak(i, hear, true, mi, game.zzword);
rspeak(NO_MESSAGE);
if (i == BIRD && mi == BIRD_ENDSTATE)
DESTROY(BIRD);
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) {
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. */
{
}
}
-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]))
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) {
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) {
}
}
-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) {
return GO_CLEAROBJ;
}
-static int say(struct command_t command)
+static phase_codes_t say(command_t command)
/* Say. Echo WD2. Magic words override. */
{
if (command.word[1].type == MOTION &&
- (command.word[1].id == XYZZY ||
- command.word[1].id == PLUGH ||
- command.word[1].id == PLOVER)) {
- return GO_WORD2;
+ (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)) {
+ 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(vocab_t 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
}
}
-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 ||
}
}
-static int seed(verb_t verb, const char *arg)
+static phase_codes_t seed(verb_t verb, const char *arg)
/* Set seed */
{
- int seed = atoi(arg);
+ int32_t seed = strtol(arg, NULL, 10);
speak(actions[verb].message, seed);
set_seed(seed);
--game.turns;
return GO_TOP;
}
-static int waste(verb_t verb, turn_t turns)
+static phase_codes_t waste(verb_t verb, turn_t turns)
/* Burn turns */
{
game.limit -= turns;
return GO_TOP;
}
-static int wave(verb_t verb, obj_t obj)
+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 ||
}
}
-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.
*/
{
- /* Previously, actions that result in a message, but don't do anything
- * further were called "specials". Now they're handled here as normal
+ /* 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
return GO_CLEAROBJ;
}
- if (command.word[1].id != WORD_EMPTY && command.word[1].id != WORD_NOT_FOUND)
- return GO_WORD2;
if (command.verb != 0)
command.part = transitive;
}
if (command.word[1].raw[0] != '\0' && command.verb != SAY)
return GO_WORD2;
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. */
+ /* 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) {
case RUB:
return rub(command.verb, command.obj);
case THROW:
- return throw(command);
+ return throw (command);
case QUIT: {
speak(actions[command.verb].message);
return GO_CLEAROBJ;
speak(actions[command.verb].message);
return GO_CLEAROBJ;
}
- // LCOV_EXCL_START
- // This case should never happen - here only as placeholder
+ // LCOV_EXCL_START
+ // This case should never happen - here only as placeholder
case PART:
return reservoir();
- // LCOV_EXCL_STOP
+ // LCOV_EXCL_STOP
case SEED:
return seed(command.verb, command.word[1].raw);
case WASTE:
projects / open-adventure.git / blobdiff