projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Begin replacing tests on strings with tests on vocab IDs.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 5e650f6bec9c344afcb80c3fa652849e257bd889..b079bd352f863da9e3dab42a30da543b34efa5a9 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-1,5
+1,6
@@
#include <stdlib.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <string.h>
#include "advent.h"
#include "dungeon.h"
#include "advent.h"
#include "dungeon.h"
@@
-21,7
+22,8
@@
static int attack(struct command_t *command)
vocab_t obj = command->obj;
long spk = actions[verb].message;
vocab_t obj = command->obj;
long spk = actions[verb].message;
- if (obj == NO_OBJECT || obj == INTRANSITIVE) {
+ if (obj == NO_OBJECT ||
+ obj == INTRANSITIVE) {
int changes = 0;
if (atdwrf(game.loc) > 0) {
obj = DWARF;
int changes = 0;
if (atdwrf(game.loc) > 0) {
obj = DWARF;
@@
-84,7
+86,8
@@
static int attack(struct command_t *command)
if (obj == NO_OBJECT)
spk = NO_TARGET;
if (obj == NO_OBJECT)
spk = NO_TARGET;
- if (obj == CLAM || obj == OYSTER)
+ if (obj == CLAM ||
+ obj == OYSTER)
spk = SHELL_IMPERVIOUS;
if (obj == SNAKE)
spk = SNAKE_WARNING;
spk = SHELL_IMPERVIOUS;
if (obj == SNAKE)
spk = SNAKE_WARNING;
@@
-110,7
+113,9
@@
static int attack(struct command_t *command)
game.dseen[i] = false;
}
}
game.dseen[i] = false;
}
}
- spk = (dwarves > 1) ? OGRE_PANIC1 : OGRE_PANIC2;
+ spk = (dwarves > 1) ?
+ OGRE_PANIC1 :
+ OGRE_PANIC2;
} else if (obj == BEAR) {
switch (game.prop[BEAR]) {
case UNTAMED_BEAR:
} else if (obj == BEAR) {
switch (game.prop[BEAR]) {
case UNTAMED_BEAR:
@@
-150,7
+155,8
@@
static int attack(struct command_t *command)
move(RUG, k);
drop(BLOOD, k);
for (obj = 1; obj <= NOBJECTS; obj++) {
move(RUG, k);
drop(BLOOD, k);
for (obj = 1; obj <= NOBJECTS; obj++) {
- if (game.place[obj] == objects[DRAGON].plac || game.place[obj] == objects[DRAGON].fixd)
+ if (game.place[obj] == objects[DRAGON].plac ||
+ game.place[obj] == objects[DRAGON].fixd)
move(obj, k);
}
game.loc = k;
move(obj, k);
}
game.loc = k;
@@
-166,7
+172,7
@@
static int bigwords(token_t foo)
* 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). */
{
* 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). */
{
- char word[
6
];
+ char word[
TOKLEN+1
];
packed_to_token(foo, word);
int k = (int) get_special_vocab_id(word);
int spk = NOTHING_HAPPENS;
packed_to_token(foo, word);
int k = (int) get_special_vocab_id(word);
int spk = NOTHING_HAPPENS;
@@
-182,7
+188,8
@@
static int bigwords(token_t foo)
return GO_CLEAROBJ;
}
game.foobar = 0;
return GO_CLEAROBJ;
}
game.foobar = 0;
- if (game.place[EGGS] == objects[EGGS].plac || (TOTING(EGGS) && game.loc == objects[EGGS].plac)) {
+ if (game.place[EGGS] == objects[EGGS].plac ||
+ (TOTING(EGGS) && game.loc == objects[EGGS].plac)) {
rspeak(spk);
return GO_CLEAROBJ;
} else {
rspeak(spk);
return GO_CLEAROBJ;
} else {
@@
-205,28
+212,40
@@
static int bigwords(token_t foo)
static int bivalve(token_t verb, token_t obj)
/* Clam/oyster actions */
{
static int bivalve(token_t verb, token_t obj)
/* Clam/oyster actions */
{
- int spk;
bool is_oyster = (obj == OYSTER);
bool is_oyster = (obj == OYSTER);
- spk = is_oyster ? OYSTER_OPENS : PEARL_FALLS;
- if (TOTING(obj))
- spk = is_oyster ? DROP_OYSTER : DROP_CLAM;
- if (!TOTING(TRIDENT))
- spk = is_oyster ? OYSTER_OPENER : CLAM_OPENER;
- if (verb == LOCK)
- spk = HUH_MAN;
- if (spk == PEARL_FALLS) {
+ if (verb == LOCK) {
+ rspeak(HUH_MAN);
+ return GO_CLEAROBJ;
+ }
+ if (!TOTING(TRIDENT)) {
+ rspeak(is_oyster ?
+ OYSTER_OPENER :
+ CLAM_OPENER);
+ return GO_CLEAROBJ;
+ }
+ if (TOTING(obj)) {
+ rspeak( is_oyster ?
+ DROP_OYSTER :
+ DROP_CLAM);
+ return GO_CLEAROBJ;
+ }
+
+ if (!is_oyster) {
DESTROY(CLAM);
drop(OYSTER, game.loc);
drop(PEARL, LOC_CULDESAC);
}
DESTROY(CLAM);
drop(OYSTER, game.loc);
drop(PEARL, LOC_CULDESAC);
}
- rspeak(spk);
+ rspeak(is_oyster ?
+ OYSTER_OPENS :
+ PEARL_FALLS);
return GO_CLEAROBJ;
}
static void blast(void)
/* Blast. No effect unless you've got dynamite, which is a neat trick! */
{
return GO_CLEAROBJ;
}
static void blast(void)
/* Blast. No effect unless you've got dynamite, which is a neat trick! */
{
- if (game.prop[ROD2] < 0 || !game.closed)
+ if (game.prop[ROD2] < 0 ||
+ !game.closed)
rspeak(REQUIRES_DYNAMITE);
else {
game.bonus = VICTORY_MESSAGE;
rspeak(REQUIRES_DYNAMITE);
else {
game.bonus = VICTORY_MESSAGE;
@@
-316,8
+335,10
@@
static int vcarry(token_t verb, token_t obj)
rspeak(spk);
return GO_CLEAROBJ;
}
rspeak(spk);
return GO_CLEAROBJ;
}
- if (obj == WATER || obj == OIL) {
- if (!HERE(BOTTLE) || LIQUID() != obj) {
+ if (obj == WATER ||
+ obj == OIL) {
+ if (!HERE(BOTTLE) ||
+ LIQUID() != obj) {
if (TOTING(BOTTLE) && game.prop[BOTTLE] == EMPTY_BOTTLE)
return (fill(verb, BOTTLE));
else {
if (TOTING(BOTTLE) && game.prop[BOTTLE] == EMPTY_BOTTLE)
return (fill(verb, BOTTLE));
else {
@@
-346,13
+367,18
@@
static int vcarry(token_t verb, token_t obj)
spk = CANNOT_CARRY;
if (TOTING(ROD))
spk = BIRD_EVADES;
spk = CANNOT_CARRY;
if (TOTING(ROD))
spk = BIRD_EVADES;
- if (spk == CANNOT_CARRY || spk == BIRD_EVADES) {
+ if (spk == CANNOT_CARRY ||
+ spk == BIRD_EVADES) {
rspeak(spk);
return GO_CLEAROBJ;
}
game.prop[BIRD] = BIRD_CAGED;
}
rspeak(spk);
return GO_CLEAROBJ;
}
game.prop[BIRD] = BIRD_CAGED;
}
- if ((obj == BIRD || obj == CAGE) && (game.prop[BIRD] == BIRD_CAGED || -1 - game.prop[BIRD] == 1))
+ /* FIXME: Arithmetic on state numbers */
+ if ((obj == BIRD ||
+ obj == CAGE) &&
+ (game.prop[BIRD] == BIRD_CAGED ||
+ -1 - game.prop[BIRD] == 1))
carry(BIRD + CAGE - obj, game.loc);
carry(obj, game.loc);
if (obj == BOTTLE && LIQUID() != 0)
carry(BIRD + CAGE - obj, game.loc);
carry(obj, game.loc);
if (obj == BOTTLE && LIQUID() != 0)
@@
-429,8
+455,8
@@
static int discard(token_t verb, token_t obj, bool just_do_it)
rspeak(GEM_FITS);
game.prop[obj] = 1;
game.prop[CAVITY] = CAVITY_FULL;
rspeak(GEM_FITS);
game.prop[obj] = 1;
game.prop[CAVITY] = CAVITY_FULL;
- if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) ||
(obj == RUBY &&
- game.prop[RUG] == RUG_HOVER))) {
+ if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) ||
+
(obj == RUBY &&
game.prop[RUG] == RUG_HOVER))) {
spk = RUG_RISES;
if (TOTING(RUG))
spk = RUG_WIGGLES;
spk = RUG_RISES;
if (TOTING(RUG))
spk = RUG_WIGGLES;
@@
-463,7
+489,8
@@
static int discard(token_t verb, token_t obj, bool just_do_it)
move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
juggle(CHASM);
game.prop[TROLL] = TROLL_GONE;
move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
juggle(CHASM);
game.prop[TROLL] = TROLL_GONE;
- } else if (obj != VASE || game.loc == objects[PILLOW].plac) {
+ } else if (obj != VASE ||
+ game.loc == objects[PILLOW].plac) {
rspeak(OK_MAN);
} else {
game.prop[VASE] = VASE_BROKEN;
rspeak(OK_MAN);
} else {
game.prop[VASE] = VASE_BROKEN;
@@
-494,7
+521,8
@@
static int drink(token_t verb, token_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. */
{
/* 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. */
{
- if (obj == NO_OBJECT && LIQLOC(game.loc) != WATER && (LIQUID() != WATER || !HERE(BOTTLE)))
+ if (obj == NO_OBJECT && LIQLOC(game.loc) != WATER && (LIQUID() != WATER ||
+ !HERE(BOTTLE)))
return GO_UNKNOWN;
if (obj != BLOOD) {
if (obj != NO_OBJECT && obj != WATER) {
return GO_UNKNOWN;
if (obj != BLOOD) {
if (obj != NO_OBJECT && obj != WATER) {
@@
-530,9
+558,15
@@
static int eat(token_t verb, token_t obj)
rspeak(THANKS_DELICIOUS);
return GO_CLEAROBJ;
}
rspeak(THANKS_DELICIOUS);
return GO_CLEAROBJ;
}
- if (obj == BIRD || obj == SNAKE || obj == CLAM || obj == OYSTER || obj ==
- DWARF || obj == DRAGON || obj == TROLL || obj == BEAR || obj ==
- OGRE) {
+ if (obj == BIRD ||
+ obj == SNAKE ||
+ obj == CLAM ||
+ obj == OYSTER ||
+ obj == DWARF ||
+ obj == DRAGON ||
+ obj == TROLL ||
+ obj == BEAR ||
+ obj == OGRE) {
rspeak(LOST_APPETITE);
return GO_CLEAROBJ;
}
rspeak(LOST_APPETITE);
return GO_CLEAROBJ;
}
@@
-563,8
+597,12
@@
static int extinguish(token_t verb, int obj)
} else if (obj == LAMP) {
state_change(LAMP, LAMP_DARK);
} else if (obj == LAMP) {
state_change(LAMP, LAMP_DARK);
- rspeak(DARK(game.loc) ? PITCH_DARK : NO_MESSAGE);
- } else if (obj == DRAGON || obj == VOLCANO) {
+ rspeak(DARK(game.loc) ?
+ PITCH_DARK :
+ NO_MESSAGE);
+
+ } else if (obj == DRAGON ||
+ obj == VOLCANO) {
rspeak(BEYOND_POWER);
} else {
rspeak(BEYOND_POWER);
} else {
@@
-581,7
+619,9
@@
static int feed(token_t verb, token_t obj)
if (obj == BIRD) {
rspeak(BIRD_PINING);
return GO_CLEAROBJ;
if (obj == BIRD) {
rspeak(BIRD_PINING);
return GO_CLEAROBJ;
- } else if (obj == SNAKE || obj == DRAGON || obj == TROLL) {
+ } else if (obj == SNAKE ||
+ obj == DRAGON ||
+ obj == TROLL) {
spk = NOTHING_EDIBLE;
if (obj == DRAGON && game.prop[DRAGON] != DRAGON_BARS)
spk = RIDICULOUS_ATTEMPT;
spk = NOTHING_EDIBLE;
if (obj == DRAGON && game.prop[DRAGON] != DRAGON_BARS)
spk = RIDICULOUS_ATTEMPT;
@@
-628,7
+668,8
@@
int fill(token_t verb, token_t obj)
spk = ARENT_CARRYING;
if (LIQLOC(game.loc) == 0)
spk = FILL_INVALID;
spk = ARENT_CARRYING;
if (LIQLOC(game.loc) == 0)
spk = FILL_INVALID;
- if (LIQLOC(game.loc) == 0 || !TOTING(VASE)) {
+ if (LIQLOC(game.loc) == 0 ||
+ !TOTING(VASE)) {
rspeak(spk);
return GO_CLEAROBJ;
}
rspeak(spk);
return GO_CLEAROBJ;
}
@@
-644,7
+685,8
@@
int fill(token_t verb, token_t obj)
}
spk = FILL_INVALID;
k = LIQUID();
}
spk = FILL_INVALID;
k = LIQUID();
- if (k == 0 || !HERE(BOTTLE)) {
+ if (k == 0 ||
+ !HERE(BOTTLE)) {
rspeak(spk);
return GO_CLEAROBJ;
}
rspeak(spk);
return GO_CLEAROBJ;
}
@@
-700,36
+742,36
@@
static int find(token_t verb, token_t obj)
static int fly(token_t verb, token_t obj)
/* Fly. Snide remarks unless hovering rug is here. */
{
static int fly(token_t verb, token_t obj)
/* Fly. Snide remarks unless hovering rug is here. */
{
- int spk = actions[verb].message;
if (obj == INTRANSITIVE) {
if (obj == INTRANSITIVE) {
- if (
game.prop[RUG] != RUG_HOVER)
-
spk = RUG_NOTHING2
;
- if (!HERE(RUG))
- spk = FLAP_ARMS;
- if (
spk == RUG_NOTHING2 || spk == FLAP_ARMS
) {
- rspeak(
spk
);
+ if (
!HERE(RUG)) {
+
rspeak(FLAP_ARMS)
;
+ return GO_CLEAROBJ;
+ }
+ if (
game.prop[RUG] != RUG_HOVER
) {
+ rspeak(
RUG_NOTHING2
);
return GO_CLEAROBJ;
}
obj = RUG;
}
if (obj != RUG) {
return GO_CLEAROBJ;
}
obj = RUG;
}
if (obj != RUG) {
- rspeak(
spk
);
+ rspeak(
actions[verb].message
);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
- spk = RUG_NOTHING1;
if (game.prop[RUG] != RUG_HOVER) {
if (game.prop[RUG] != RUG_HOVER) {
- rspeak(
spk
);
+ rspeak(
RUG_NOTHING1
);
return GO_CLEAROBJ;
}
game.oldlc2 = game.oldloc;
game.oldloc = game.loc;
/* FIXME: Arithmetic on location values */
game.newloc = game.place[RUG] + game.fixed[RUG] - game.loc;
return GO_CLEAROBJ;
}
game.oldlc2 = game.oldloc;
game.oldloc = game.loc;
/* FIXME: Arithmetic on location values */
game.newloc = game.place[RUG] + game.fixed[RUG] - game.loc;
- spk = RUG_GOES;
- if (game.prop[SAPPH] >= 0)
- spk = RUG_RETURNS;
- rspeak(spk);
+
+ if (game.prop[SAPPH] >= 0) {
+ rspeak(RUG_RETURNS);
+ } else {
+ rspeak(RUG_GOES);
+ }
return GO_TERMINATE;
}
return GO_TERMINATE;
}
@@
-738,7
+780,8
@@
static int inven(void)
{
int spk = NO_CARRY;
for (int i = 1; i <= NOBJECTS; i++) {
{
int spk = NO_CARRY;
for (int i = 1; i <= NOBJECTS; i++) {
- if (i == BEAR || !TOTING(i))
+ if (i == BEAR ||
+ !TOTING(i))
continue;
if (spk == NO_CARRY)
rspeak(NOW_HOLDING);
continue;
if (spk == NO_CARRY)
rspeak(NOW_HOLDING);
@@
-766,7
+809,9
@@
static int light(token_t verb, token_t obj)
}
if (obj == URN) {
}
if (obj == URN) {
- state_change(URN, game.prop[URN] == URN_EMPTY ? URN_EMPTY : URN_LIT);
+ state_change(URN, game.prop[URN] == URN_EMPTY ?
+ URN_EMPTY :
+ URN_LIT);
return GO_CLEAROBJ;
} else {
if (obj != LAMP) {
return GO_CLEAROBJ;
} else {
if (obj != LAMP) {
@@
-796,7
+841,9
@@
static int listen(void)
return GO_CLEAROBJ;
}
for (int i = 1; i <= NOBJECTS; i++) {
return GO_CLEAROBJ;
}
for (int i = 1; i <= NOBJECTS; i++) {
- if (!HERE(i) || objects[i].sounds[0] == NULL || game.prop[i] < 0)
+ if (!HERE(i) ||
+ objects[i].sounds[0] == NULL ||
+ game.prop[i] < 0)
continue;
int mi = game.prop[i];
if (i == BIRD)
continue;
int mi = game.prop[i];
if (i == BIRD)
@@
-827,7
+874,8
@@
static int lock(token_t verb, token_t obj)
obj = GRATE;
if (HERE(CHAIN))
obj = CHAIN;
obj = GRATE;
if (HERE(CHAIN))
obj = CHAIN;
- if (obj == NO_OBJECT || obj == INTRANSITIVE) {
+ if (obj == NO_OBJECT ||
+ obj == INTRANSITIVE) {
rspeak(NOTHING_LOCKED);
return GO_CLEAROBJ;
}
rspeak(NOTHING_LOCKED);
return GO_CLEAROBJ;
}
@@
-844,7
+892,8
@@
static int lock(token_t verb, token_t obj)
spk = NO_LOCK;
if (obj == KEYS)
spk = CANNOT_UNLOCK;
spk = NO_LOCK;
if (obj == KEYS)
spk = CANNOT_UNLOCK;
- if (obj == GRATE || obj == CHAIN) {
+ if (obj == GRATE ||
+ obj == CHAIN) {
spk = NO_KEYS;
if (HERE(KEYS)) {
if (obj == CHAIN)
spk = NO_KEYS;
if (HERE(KEYS)) {
if (obj == CHAIN)
@@
-855,7
+904,9
@@
static int lock(token_t verb, token_t obj)
game.clock2 = PANICTIME;
game.panic = true;
} else {
game.clock2 = PANICTIME;
game.panic = true;
} else {
- state_change(GRATE, (verb == LOCK) ? GRATE_CLOSED : GRATE_OPEN);
+ state_change(GRATE, (verb == LOCK) ?
+ GRATE_CLOSED :
+ GRATE_OPEN);
return GO_CLEAROBJ;
}
}
return GO_CLEAROBJ;
}
}
@@
-868,7
+919,8
@@
static int pour(token_t verb, token_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. */
{
/* Pour. If no object, or object is bottle, assume contents of bottle.
* special tests for pouring water or oil on plant or rusty door. */
{
- if (obj == BOTTLE || obj == NO_OBJECT)
+ if (obj == BOTTLE ||
+ obj == NO_OBJECT)
obj = LIQUID();
if (obj == NO_OBJECT)
return GO_UNKNOWN;
obj = LIQUID();
if (obj == NO_OBJECT)
return GO_UNKNOWN;
@@
-885,7
+937,8
@@
static int pour(token_t verb, token_t obj)
return fill(verb, URN);
game.prop[BOTTLE] = EMPTY_BOTTLE;
game.place[obj] = LOC_NOWHERE;
return fill(verb, URN);
game.prop[BOTTLE] = EMPTY_BOTTLE;
game.place[obj] = LOC_NOWHERE;
- if (!(AT(PLANT) || AT(DOOR))) {
+ if (!(AT(PLANT) ||
+ AT(DOOR))) {
rspeak(GROUND_WET);
return GO_CLEAROBJ;
}
rspeak(GROUND_WET);
return GO_CLEAROBJ;
}
@@
-894,12
+947,15
@@
static int pour(token_t verb, token_t obj)
rspeak(SHAKING_LEAVES);
return GO_CLEAROBJ;
}
rspeak(SHAKING_LEAVES);
return GO_CLEAROBJ;
}
+ /* FIXME: Arithmetic on state numbers */
pspeak(PLANT, look, game.prop[PLANT] + 3, true);
game.prop[PLANT] = MOD(game.prop[PLANT] + 1, 3);
game.prop[PLANT2] = game.prop[PLANT];
return GO_MOVE;
} else {
pspeak(PLANT, look, game.prop[PLANT] + 3, true);
game.prop[PLANT] = MOD(game.prop[PLANT] + 1, 3);
game.prop[PLANT2] = game.prop[PLANT];
return GO_MOVE;
} else {
- state_change(DOOR, (obj == OIL) ? DOOR_UNRUSTED : DOOR_RUSTED);
+ state_change(DOOR, (obj == OIL) ?
+ DOOR_UNRUSTED :
+ DOOR_RUSTED);
return GO_CLEAROBJ;
}
}
return GO_CLEAROBJ;
}
}
@@
-921,15
+977,18
@@
static int read(struct command_t command)
if (HERE(i) && objects[i].texts[0] != NULL && game.prop[i] >= 0)
command.obj = command.obj * NOBJECTS + i;
}
if (HERE(i) && objects[i].texts[0] != NULL && game.prop[i] >= 0)
command.obj = command.obj * NOBJECTS + i;
}
- if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc))
+ if (command.obj > NOBJECTS ||
+ command.obj == 0 ||
+ DARK(game.loc))
return GO_UNKNOWN;
}
if (DARK(game.loc)) {
return GO_UNKNOWN;
}
if (DARK(game.loc)) {
-
rspeak(NO_SEE, command.wd1, command.wd1x
);
+
sspeak(NO_SEE, command.raw1
);
} 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 (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] < 0) {
+ } else if (objects[command.obj].texts[0] == NULL ||
+ game.prop[command.obj] < 0) {
rspeak(actions[command.verb].message);
} else
pspeak(command.obj, study, game.prop[command.obj], true);
rspeak(actions[command.verb].message);
} else
pspeak(command.obj, study, game.prop[command.obj], true);
@@
-939,17
+998,19
@@
static int read(struct command_t command)
static int reservoir(void)
/* Z'ZZZ (word gets recomputed at startup; different each game). */
{
static int reservoir(void)
/* Z'ZZZ (word gets recomputed at startup; different each game). */
{
+ /* FIXME: Arithmetic on state numbers */
if (!AT(RESER) && game.loc != game.fixed[RESER] - 1) {
rspeak(NOTHING_HAPPENS);
return GO_CLEAROBJ;
} else {
if (!AT(RESER) && game.loc != game.fixed[RESER] - 1) {
rspeak(NOTHING_HAPPENS);
return GO_CLEAROBJ;
} else {
+ /* FIXME: Arithmetic on state numbers */
pspeak(RESER, look, game.prop[RESER] + 1, true);
game.prop[RESER] = 1 - game.prop[RESER];
if (AT(RESER))
return GO_CLEAROBJ;
else {
game.oldlc2 = game.loc;
pspeak(RESER, look, game.prop[RESER] + 1, true);
game.prop[RESER] = 1 - game.prop[RESER];
if (AT(RESER))
return GO_CLEAROBJ;
else {
game.oldlc2 = game.loc;
- game.newloc =
0
;
+ game.newloc =
LOC_NOWHERE
;
rspeak(NOT_BRIGHT);
return GO_TERMINATE;
}
rspeak(NOT_BRIGHT);
return GO_TERMINATE;
}
@@
-977,22
+1038,26
@@
static int rub(token_t verb, token_t obj)
static int say(struct command_t *command)
/* Say. Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).) Magic words override. */
{
static int say(struct command_t *command)
/* Say. Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).) Magic words override. */
{
- long a = command->wd1
, b = command->wd1x
;
+ long a = command->wd1;
if (command->wd2 > 0) {
a = command->wd2;
if (command->wd2 > 0) {
a = command->wd2;
- b = command->wd2x;
command->wd1 = command->wd2;
command->wd1 = command->wd2;
+ strcpy(command->raw1, command->raw2);
}
}
- char word1[
6
];
+ char word1[
TOKLEN+1
];
packed_to_token(command->wd1, word1);
int wd = (int) get_vocab_id(word1);
/* FIXME: magic numbers */
packed_to_token(command->wd1, word1);
int wd = (int) get_vocab_id(word1);
/* FIXME: magic numbers */
- if (wd == MOTION_WORD(XYZZY) || wd == MOTION_WORD(PLUGH) || wd == MOTION_WORD(PLOVER) || wd == ACTION_WORD(GIANTWORDS) || wd == ACTION_WORD(PART)) {
+ if (wd == MOTION_WORD(XYZZY) ||
+ wd == MOTION_WORD(PLUGH) ||
+ wd == MOTION_WORD(PLOVER) ||
+ wd == ACTION_WORD(GIANTWORDS) ||
+ wd == ACTION_WORD(PART)) {
/* FIXME: scribbles on the interpreter's command block */
wordclear(&command->wd2);
return GO_LOOKUP;
}
/* FIXME: scribbles on the interpreter's command block */
wordclear(&command->wd2);
return GO_LOOKUP;
}
-
rspeak(OKEY_DOKEY, a, b
);
+
sspeak(OKEY_DOKEY, command->raw1
);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
@@
-1058,9
+1123,10
@@
static int throw (struct command_t *command)
} else {
long i = atdwrf(game.loc);
game.dseen[i] = false;
} else {
long i = atdwrf(game.loc);
game.dseen[i] = false;
- game.dloc[i] = 0;
- return throw_support((++game.dkill == 1)
- ? DWARF_SMOKE : KILLED_DWARF);
+ game.dloc[i] = LOC_NOWHERE;
+ return throw_support((++game.dkill == 1) ?
+ DWARF_SMOKE :
+ KILLED_DWARF);
}
}
}
}
}
}
@@
-1068,7
+1134,8
@@
static int throw (struct command_t *command)
static int wake(token_t verb, token_t obj)
/* Wake. Only use is to disturb the dwarves. */
{
static int wake(token_t verb, token_t obj)
/* Wake. Only use is to disturb the dwarves. */
{
- if (obj != DWARF || !game.closed) {
+ if (obj != DWARF ||
+ !game.closed) {
rspeak(actions[verb].message);
return GO_CLEAROBJ;
} else {
rspeak(actions[verb].message);
return GO_CLEAROBJ;
} else {
@@
-1082,8
+1149,13
@@
static int wave(token_t verb, token_t obj)
{
if (obj != ROD ||
!TOTING(obj) ||
{
if (obj != ROD ||
!TOTING(obj) ||
- (!HERE(BIRD) && (game.closng || !AT(FISSURE)))) {
- rspeak(((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2))) ? ARENT_CARRYING : actions[verb].message);
+ (!HERE(BIRD) &&
+ (game.closng ||
+ !AT(FISSURE)))) {
+ rspeak(((!TOTING(obj)) && (obj != ROD ||
+ !TOTING(ROD2))) ?
+ ARENT_CARRYING :
+ actions[verb].message);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
@@
-1095,15
+1167,22
@@
static int wave(token_t verb, token_t obj)
return GO_CLEAROBJ;
} else {
if (game.closed) {
return GO_CLEAROBJ;
} else {
if (game.closed) {
- rspeak((game.prop[BIRD] == BIRD_CAGED) ? CAGE_FLY : FREE_FLY);
+ rspeak((game.prop[BIRD] == BIRD_CAGED) ?
+ CAGE_FLY :
+ FREE_FLY);
return GO_DWARFWAKE;
}
return GO_DWARFWAKE;
}
- if (game.closng || !AT(FISSURE)) {
- rspeak((game.prop[BIRD] == BIRD_CAGED) ? CAGE_FLY : FREE_FLY);
+ if (game.closng ||
+ !AT(FISSURE)) {
+ rspeak((game.prop[BIRD] == BIRD_CAGED) ?
+ CAGE_FLY :
+ FREE_FLY);
return GO_CLEAROBJ;
}
if (HERE(BIRD))
return GO_CLEAROBJ;
}
if (HERE(BIRD))
- rspeak((game.prop[BIRD] == BIRD_CAGED) ? CAGE_FLY : FREE_FLY);
+ rspeak((game.prop[BIRD] == BIRD_CAGED) ?
+ CAGE_FLY :
+ FREE_FLY);
/* FIXME: Arithemetic on property values */
game.prop[FISSURE] = 1 - game.prop[FISSURE];
/* FIXME: Arithemetic on property values */
game.prop[FISSURE] = 1 - game.prop[FISSURE];
@@
-1128,14
+1207,22
@@
int action(struct command_t *command)
if (HERE(command->obj))
/* FALL THROUGH */;
else if (command->obj == GRATE) {
if (HERE(command->obj))
/* FALL THROUGH */;
else if (command->obj == GRATE) {
- if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT)
+ if (game.loc == LOC_START ||
+ game.loc == LOC_VALLEY ||
+ game.loc == LOC_SLIT) {
command->obj = DPRSSN;
command->obj = DPRSSN;
- if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD ||
- game.loc == LOC_BIRD || game.loc == LOC_PITTOP)
+ }
+ 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 = ENTRNC;
+ }
} else if (command->obj == DWARF && atdwrf(game.loc) > 0)
/* FALL THROUGH */;
} 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] != 0) {
command->obj = URN;
/* FALL THROUGH */;
else if (command->obj == OIL && HERE(URN) && game.prop[URN] != 0) {
command->obj = URN;
@@
-1150,10
+1237,11
@@
int action(struct command_t *command)
} else if (command->obj == ROD && HERE(ROD2)) {
command->obj = ROD2;
/* FALL THROUGH */;
} 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->wd2 <= 0)
/* FALL THROUGH */;
else {
/* FALL THROUGH */;
else {
-
rspeak(NO_SEE, command->wd1, command->wd1x
);
+
sspeak(NO_SEE, command->raw1
);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
@@
-1169,7
+1257,8
@@
int action(struct command_t *command)
return GO_WORD2;
if (command->verb == SAY)
command->obj = command->wd2;
return GO_WORD2;
if (command->verb == SAY)
command->obj = command->wd2;
- if (command->obj == 0 || command->obj == INTRANSITIVE) {
+ if (command->obj == 0 ||
+ command->obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */
switch (command->verb) {
case CARRY:
/* Analyse an intransitive verb (ie, no object given yet). */
switch (command->verb) {
case CARRY:
@@
-1349,7
+1438,7
@@
int action(struct command_t *command)
}
case unknown:
/* Unknown verb, couldn't deduce object - might need hint */
}
case unknown:
/* Unknown verb, couldn't deduce object - might need hint */
-
rspeak(WHAT_DO, command->wd1, command->wd1x
);
+
sspeak(WHAT_DO, command->raw1
);
return GO_CHECKHINT;
default:
BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE
return GO_CHECKHINT;
default:
BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE