projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove testing for intransitive seperate from NO_OBJECT in attact()
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 0a5b8edb30ba09bcbb50c55ded35b0eec4a5a464..a6f686d5115477059387e896308e65a9d498e08d 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-20,11
+20,8
@@
static int attack(struct command_t *command)
vocab_t verb = command->verb;
vocab_t obj = command->obj;
vocab_t verb = command->verb;
vocab_t obj = command->obj;
- if (obj == INTRANSITIVE) {
- return GO_UNKNOWN;
- }
long spk = actions[verb].message;
long spk = actions[verb].message;
- if (obj ==
0
|| 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;
@@
-51,7
+48,7
@@
static int attack(struct command_t *command)
++changes;
}
/* check for low-priority targets */
++changes;
}
/* check for low-priority targets */
- if (obj ==
0
) {
+ if (obj ==
NO_OBJECT
) {
/* Can't attack bird or machine by throwing axe. */
if (HERE(BIRD) && verb != THROW) {
obj = BIRD;
/* Can't attack bird or machine by throwing axe. */
if (HERE(BIRD) && verb != THROW) {
obj = BIRD;
@@
-85,7
+82,7
@@
static int attack(struct command_t *command)
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
- if (obj ==
0
)
+ if (obj ==
NO_OBJECT
)
spk = NO_TARGET;
if (obj == CLAM || obj == OYSTER)
spk = SHELL_IMPERVIOUS;
spk = NO_TARGET;
if (obj == CLAM || obj == OYSTER)
spk = SHELL_IMPERVIOUS;
@@
-166,10
+163,9
@@
static int attack(struct command_t *command)
static int bigwords(token_t foo)
/* FEE FIE FOE FOO (AND FUM). Advance to next state if given in proper order.
static int bigwords(token_t foo)
/* FEE FIE FOE FOO (AND FUM). Advance to next state if given in proper order.
- * Look up foo in s
ection 3 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 s
pecial section of vocab to determine which word we've got.
+ *
Last
word zips the eggs back to the giant room (unless already there). */
{
{
- //int k = vocab(foo, 3);
char word[6];
packed_to_token(foo, word);
int k = (int) get_special_vocab_id(word);
char word[6];
packed_to_token(foo, word);
int k = (int) get_special_vocab_id(word);
@@
-362,7
+358,7
@@
static int vcarry(token_t verb, token_t obj)
if (obj == BOTTLE && LIQUID() != 0)
game.place[LIQUID()] = CARRIED;
if (GSTONE(obj) && game.prop[obj] != 0) {
if (obj == BOTTLE && LIQUID() != 0)
game.place[LIQUID()] = CARRIED;
if (GSTONE(obj) && game.prop[obj] != 0) {
- game.prop[obj] =
0
;
+ game.prop[obj] =
STATE_GROUND
;
game.prop[CAVITY] = CAVITY_EMPTY;
}
rspeak(OK_MAN);
game.prop[CAVITY] = CAVITY_EMPTY;
}
rspeak(OK_MAN);
@@
-461,8
+457,8
@@
static int discard(token_t verb, token_t obj, bool just_do_it)
return GO_CLEAROBJ;
} else if (obj == BEAR && AT(TROLL)) {
rspeak(TROLL_SCAMPERS);
return GO_CLEAROBJ;
} else if (obj == BEAR && AT(TROLL)) {
rspeak(TROLL_SCAMPERS);
- move(TROLL,
0
);
- move(TROLL + NOBJECTS,
0
);
+ move(TROLL,
LOC_NOWHERE
);
+ move(TROLL + NOBJECTS,
LOC_NOWHERE
);
move(TROLL2, objects[TROLL].plac);
move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
juggle(CHASM);
move(TROLL2, objects[TROLL].plac);
move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
juggle(CHASM);
@@
-498,18
+494,18
@@
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. */
{
- int spk = actions[verb].message;
- if (obj == 0 && 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) {
return GO_UNKNOWN;
if (obj != BLOOD) {
- if (obj !=
0 && obj != WATER)
-
spk = RIDICULOUS_ATTEMPT
;
-
if (spk != RIDICULOUS_ATTEMPT &&
LIQUID() == WATER && HERE(BOTTLE)) {
+ if (obj !=
NO_OBJECT && obj != WATER) {
+
rspeak(RIDICULOUS_ATTEMPT)
;
+
} else if (
LIQUID() == WATER && HERE(BOTTLE)) {
game.prop[BOTTLE] = EMPTY_BOTTLE;
game.place[WATER] = LOC_NOWHERE;
game.prop[BOTTLE] = EMPTY_BOTTLE;
game.place[WATER] = LOC_NOWHERE;
- spk = BOTTLE_EMPTY;
+ rspeak(BOTTLE_EMPTY);
+ } else {
+ rspeak(actions[verb].message);
}
}
- rspeak(spk);
} else {
DESTROY(BLOOD);
state_change(DRAGON, DRAGON_BLOODLESS);
} else {
DESTROY(BLOOD);
state_change(DRAGON, DRAGON_BLOODLESS);
@@
-560,7
+556,7
@@
static int extinguish(token_t verb, int obj)
if (game.prop[URN] != URN_EMPTY) {
state_change(URN, URN_DARK);
} else {
if (game.prop[URN] != URN_EMPTY) {
state_change(URN, URN_DARK);
} else {
- pspeak(URN, change, URN_DARK, true);
+
pspeak(URN, change, URN_DARK, true);
}
} else if (obj == LAMP) {
}
} else if (obj == LAMP) {
@@
-640,7
+636,7
@@
int fill(token_t verb, token_t obj)
return (discard(verb, obj, true));
} else if (obj == URN) {
spk = FULL_URN;
return (discard(verb, obj, true));
} else if (obj == URN) {
spk = FULL_URN;
- if (game.prop[URN] !=
0
) {
+ if (game.prop[URN] !=
URN_EMPTY
) {
rspeak(spk);
return GO_CLEAROBJ;
}
rspeak(spk);
return GO_CLEAROBJ;
}
@@
-653,19
+649,19
@@
int fill(token_t verb, token_t obj)
game.place[k] = LOC_NOWHERE;
game.prop[BOTTLE] = EMPTY_BOTTLE;
if (k == OIL)
game.place[k] = LOC_NOWHERE;
game.prop[BOTTLE] = EMPTY_BOTTLE;
if (k == OIL)
- game.prop[URN] =
1
;
+ game.prop[URN] =
URN_DARK
;
spk = WATER_URN + game.prop[URN];
rspeak(spk);
return GO_CLEAROBJ;
spk = WATER_URN + game.prop[URN];
rspeak(spk);
return GO_CLEAROBJ;
- } else if (obj !=
0
&& obj != BOTTLE) {
+ } else if (obj !=
NO_OBJECT
&& obj != BOTTLE) {
rspeak(spk);
return GO_CLEAROBJ;
rspeak(spk);
return GO_CLEAROBJ;
- } else if (obj ==
0
&& !HERE(BOTTLE))
+ } else if (obj ==
NO_OBJECT
&& !HERE(BOTTLE))
return GO_UNKNOWN;
spk = BOTTLED_WATER;
if (LIQLOC(game.loc) == 0)
spk = NO_LIQUID;
return GO_UNKNOWN;
spk = BOTTLED_WATER;
if (LIQLOC(game.loc) == 0)
spk = NO_LIQUID;
- if (HERE(URN) && game.prop[URN] !=
0
)
+ if (HERE(URN) && game.prop[URN] !=
URN_EMPTY
)
spk = URN_NOPOUR;
if (LIQUID() != 0)
spk = BOTTLE_FULL;
spk = URN_NOPOUR;
if (LIQUID() != 0)
spk = BOTTLE_FULL;
@@
-833,7
+829,7
@@
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 ==
0
|| obj == INTRANSITIVE) {
+ if (obj ==
NO_OBJECT
|| obj == INTRANSITIVE) {
rspeak(spk);
return GO_CLEAROBJ;
}
rspeak(spk);
return GO_CLEAROBJ;
}
@@
-876,9
+872,9
@@
static int pour(token_t verb, token_t obj)
* special tests for pouring water or oil on plant or rusty door. */
{
int spk = actions[verb].message;
* special tests for pouring water or oil on plant or rusty door. */
{
int spk = actions[verb].message;
- if (obj == BOTTLE || obj ==
0
)
+ if (obj == BOTTLE || obj ==
NO_OBJECT
)
obj = LIQUID();
obj = LIQUID();
- if (obj ==
0
)
+ if (obj ==
NO_OBJECT
)
return GO_UNKNOWN;
if (!TOTING(obj)) {
rspeak(spk);
return GO_UNKNOWN;
if (!TOTING(obj)) {
rspeak(spk);
@@
-942,7
+938,7
@@
static int read(struct command_t command)
} else if (objects[command.obj].texts[0] == NULL || game.prop[command.obj] < 0) {
rspeak(actions[command.verb].message);
} else
} 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);
+
pspeak(command.obj, study, game.prop[command.obj], true);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
@@
-953,7
+949,7
@@
static int reservoir(void)
rspeak(NOTHING_HAPPENS);
return GO_CLEAROBJ;
} else {
rspeak(NOTHING_HAPPENS);
return GO_CLEAROBJ;
} else {
- pspeak(RESER, look, game.prop[RESER] + 1, true);
+
pspeak(RESER, look, game.prop[RESER] + 1, true);
game.prop[RESER] = 1 - game.prop[RESER];
if (AT(RESER))
return GO_CLEAROBJ;
game.prop[RESER] = 1 - game.prop[RESER];
if (AT(RESER))
return GO_CLEAROBJ;
@@
-969,18
+965,18
@@
static int reservoir(void)
static int rub(token_t verb, token_t obj)
/* Rub. Yields various snide remarks except for lit urn. */
{
static int rub(token_t verb, token_t obj)
/* Rub. Yields various snide remarks except for lit urn. */
{
- int spk = actions[verb].message;
- if (obj != LAMP)
- spk = PECULIAR_NOTHING;
if (obj == URN && game.prop[URN] == URN_LIT) {
DESTROY(URN);
drop(AMBER, game.loc);
if (obj == URN && game.prop[URN] == URN_LIT) {
DESTROY(URN);
drop(AMBER, game.loc);
- game.prop[AMBER] =
1
;
+ game.prop[AMBER] =
AMBER_IN_ROCK
;
--game.tally;
drop(CAVITY, game.loc);
--game.tally;
drop(CAVITY, game.loc);
- spk = URN_GENIES;
+ rspeak(URN_GENIES);
+ } else if (obj != LAMP) {
+ rspeak(PECULIAR_NOTHING);
+ } else {
+ rspeak(actions[verb].message);
}
}
- rspeak(spk);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
@@
-993,12
+989,11
@@
static int say(struct command_t *command)
b = command->wd2x;
command->wd1 = command->wd2;
}
b = command->wd2x;
command->wd1 = command->wd2;
}
- //int wd = vocab(command->wd1, -1);
char word1[6];
packed_to_token(command->wd1, word1);
int wd = (int) get_vocab_id(word1);
/* FIXME: magic numbers */
char word1[6];
packed_to_token(command->wd1, word1);
int wd = (int) get_vocab_id(word1);
/* FIXME: magic numbers */
- if (wd ==
XYZZY || wd == PLUGH || wd == 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;
@@
-1020,23
+1015,21
@@
static int throw (struct command_t *command)
* (Only way to do so!) Axe also special for dragon, bear, and
* troll. Treasures special for troll. */
{
* (Only way to do so!) Axe also special for dragon, bear, and
* troll. Treasures special for troll. */
{
- int spk = actions[command->verb].message;
if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))
command->obj = ROD2;
if (!TOTING(command->obj)) {
if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))
command->obj = ROD2;
if (!TOTING(command->obj)) {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
if (objects[command->obj].is_treasure && AT(TROLL)) {
return GO_CLEAROBJ;
}
if (objects[command->obj].is_treasure && AT(TROLL)) {
- spk = TROLL_SATISFIED;
/* Snarf a treasure for the troll. */
/* Snarf a treasure for the troll. */
- drop(command->obj,
0
);
- move(TROLL,
0
);
- move(TROLL + NOBJECTS,
0
);
+ drop(command->obj,
LOC_NOWHERE
);
+ move(TROLL,
LOC_NOWHERE
);
+ move(TROLL + NOBJECTS,
LOC_NOWHERE
);
drop(TROLL2, objects[TROLL].plac);
drop(TROLL2 + NOBJECTS, objects[TROLL].fixd);
juggle(CHASM);
drop(TROLL2, objects[TROLL].plac);
drop(TROLL2 + NOBJECTS, objects[TROLL].fixd);
juggle(CHASM);
- rspeak(
spk
);
+ rspeak(
TROLL_SATISFIED
);
return GO_CLEAROBJ;
}
if (command->obj == FOOD && HERE(BEAR)) {
return GO_CLEAROBJ;
}
if (command->obj == FOOD && HERE(BEAR)) {
@@
-1047,8
+1040,7
@@
static int throw (struct command_t *command)
if (command->obj != AXE)
return (discard(command->verb, command->obj, false));
else {
if (command->obj != AXE)
return (discard(command->verb, command->obj, false));
else {
- int i = atdwrf(game.loc);
- if (i <= 0) {
+ if (atdwrf(game.loc) <= 0) {
if (AT(DRAGON) && game.prop[DRAGON] == DRAGON_BARS)
return throw_support(DRAGON_SCALES);
if (AT(TROLL))
if (AT(DRAGON) && game.prop[DRAGON] == DRAGON_BARS)
return throw_support(DRAGON_SCALES);
if (AT(TROLL))
@@
-1059,18
+1051,18
@@
static int throw (struct command_t *command)
/* This'll teach him to throw the axe at the bear! */
drop(AXE, game.loc);
game.fixed[AXE] = -1;
/* This'll teach him to throw the axe at the bear! */
drop(AXE, game.loc);
game.fixed[AXE] = -1;
- game.prop[AXE] = 1;
juggle(BEAR);
juggle(BEAR);
-
rspeak(
AXE_LOST);
+
state_change(AXE,
AXE_LOST);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
- command->obj =
0
;
+ command->obj =
NO_OBJECT
;
return (attack(command));
}
if (randrange(NDWARVES + 1) < game.dflag) {
return throw_support(DWARF_DODGES);
} else {
return (attack(command));
}
if (randrange(NDWARVES + 1) < game.dflag) {
return throw_support(DWARF_DODGES);
} else {
+ long i = atdwrf(game.loc);
game.dseen[i] = false;
game.dloc[i] = 0;
return throw_support((++game.dkill == 1)
game.dseen[i] = false;
game.dloc[i] = 0;
return throw_support((++game.dkill == 1)
@@
-1091,39
+1083,45
@@
static int wake(token_t verb, token_t obj)
}
}
}
}
+static token_t birdspeak(void)
+{
+ switch (game.prop[BIRD]) {
+ case BIRD_CAGED:
+ return CAGE_FLY;
+ default:
+ return FREE_FLY;
+ }
+}
+
static int wave(token_t verb, token_t obj)
/* Wave. No effect unless waving rod at fissure or at bird. */
{
static int wave(token_t verb, token_t obj)
/* Wave. No effect unless waving rod at fissure or at bird. */
{
- int spk = actions[verb].message;
- if ((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2)))
- spk = ARENT_CARRYING;
if (obj != ROD ||
!TOTING(obj) ||
(!HERE(BIRD) && (game.closng || !AT(FISSURE)))) {
if (obj != ROD ||
!TOTING(obj) ||
(!HERE(BIRD) && (game.closng || !AT(FISSURE)))) {
- rspeak(
spk
);
+ rspeak(
((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2))) ? ARENT_CARRYING : actions[verb].message
);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
- /* FIXME: Arithemetic on property values */
- if (HERE(BIRD))
- spk = FREE_FLY + MOD(game.prop[BIRD], 2);
- if (spk == FREE_FLY && game.loc == game.place[STEPS] && game.prop[JADE] < 0) {
+
+ if (game.prop[BIRD] == BIRD_UNCAGED && game.loc == game.place[STEPS] && game.prop[JADE] < 0) {
drop(JADE, game.loc);
game.prop[JADE] = 0;
--game.tally;
drop(JADE, game.loc);
game.prop[JADE] = 0;
--game.tally;
- spk = NECKLACE_FLY;
- rspeak(spk);
+ rspeak(NECKLACE_FLY);
return GO_CLEAROBJ;
} else {
if (game.closed) {
return GO_CLEAROBJ;
} else {
if (game.closed) {
- rspeak(
spk
);
+ rspeak(
birdspeak()
);
return GO_DWARFWAKE;
}
if (game.closng || !AT(FISSURE)) {
return GO_DWARFWAKE;
}
if (game.closng || !AT(FISSURE)) {
- rspeak(
spk
);
+ rspeak(
birdspeak()
);
return GO_CLEAROBJ;
}
if (HERE(BIRD))
return GO_CLEAROBJ;
}
if (HERE(BIRD))
- rspeak(spk);
+ rspeak(birdspeak());
+
+ /* FIXME: Arithemetic on property values */
game.prop[FISSURE] = 1 - game.prop[FISSURE];
pspeak(FISSURE, look, 2 - game.prop[FISSURE], true);
return GO_CLEAROBJ;
game.prop[FISSURE] = 1 - game.prop[FISSURE];
pspeak(FISSURE, look, 2 - game.prop[FISSURE], true);
return GO_CLEAROBJ;
@@
-1135,8
+1133,6
@@
int action(struct command_t *command)
* unless verb is "say", which snarfs arbitrary second word.
*/
{
* unless verb is "say", which snarfs arbitrary second word.
*/
{
- token_t spk = actions[command->verb].message;
-
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
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
@@
-1165,8
+1161,7
@@
int action(struct command_t *command)
/* FALL THROUGH */;
} else if (command->obj == KNIFE && game.knfloc == game.loc) {
game.knfloc = -1;
/* FALL THROUGH */;
} else if (command->obj == KNIFE && game.knfloc == game.loc) {
game.knfloc = -1;
- spk = KNIVES_VANISH;
- rspeak(spk);
+ rspeak(KNIVES_VANISH);
return GO_CLEAROBJ;
} else if (command->obj == ROD && HERE(ROD2)) {
command->obj = ROD2;
return GO_CLEAROBJ;
} else if (command->obj == ROD && HERE(ROD2)) {
command->obj = ROD2;
@@
-1216,7
+1211,7
@@
int action(struct command_t *command)
case TAME:
return GO_UNKNOWN;
case GO: {
case TAME:
return GO_UNKNOWN;
case GO: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case ATTACK:
return GO_CLEAROBJ;
}
case ATTACK:
@@
-1297,11
+1292,11
@@
int action(struct command_t *command)
case WAVE:
return wave(command->verb, command->obj);
case TAME: {
case WAVE:
return wave(command->verb, command->obj);
case TAME: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case GO: {
return GO_CLEAROBJ;
}
case GO: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case ATTACK:
return GO_CLEAROBJ;
}
case ATTACK:
@@
-1317,7
+1312,7
@@
int action(struct command_t *command)
case THROW:
return throw (command);
case QUIT: {
case THROW:
return throw (command);
case QUIT: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case FIND:
return GO_CLEAROBJ;
}
case FIND:
@@
-1332,15
+1327,15
@@
int action(struct command_t *command)
blast();
return GO_CLEAROBJ;
case SCORE: {
blast();
return GO_CLEAROBJ;
case SCORE: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case GIANTWORDS: {
return GO_CLEAROBJ;
}
case GIANTWORDS: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case BRIEF: {
return GO_CLEAROBJ;
}
case BRIEF: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case READ:
return GO_CLEAROBJ;
}
case READ:
@@
-1350,17
+1345,17
@@
int action(struct command_t *command)
case WAKE:
return wake(command->verb, command->obj);
case SAVE: {
case WAKE:
return wake(command->verb, command->obj);
case SAVE: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case RESUME: {
return GO_CLEAROBJ;
}
case RESUME: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case FLY:
return fly(command->verb, command->obj);
case LISTEN: {
return GO_CLEAROBJ;
}
case FLY:
return fly(command->verb, command->obj);
case LISTEN: {
- rspeak(
spk
);
+ rspeak(
actions[command->verb].message
);
return GO_CLEAROBJ;
}
case PART:
return GO_CLEAROBJ;
}
case PART: