archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unspk'd pour command

Browse source
This commit is contained in:
NHOrus 2017-07-03 06:12:19 +03:00
parent 5613b0ce36
commit 38970a1c98
4 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
actions.c
View file

@ -873,33 +873,30 @@ static int pour(token_t verb, token_t obj)
/* Pour. If no object, or object is bottle, assume contents of bottle. /* Pour. If no object, or object is bottle, assume contents of bottle.
* special tests for pouring water or oil on plant or rusty door. */ * special tests for pouring water or oil on plant or rusty door. */
{ {
int spk = actions[verb].message;
if (obj == BOTTLE || obj == NO_OBJECT) if (obj == BOTTLE || obj == NO_OBJECT)
obj = LIQUID(); obj = LIQUID();
if (obj == NO_OBJECT) if (obj == NO_OBJECT)
return GO_UNKNOWN; return GO_UNKNOWN;
if (!TOTING(obj)) { if (!TOTING(obj)) {
rspeak(spk); rspeak(actions[verb].message);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
spk = CANT_POUR;
if (obj != OIL && obj != WATER) { if (obj != OIL && obj != WATER) {
rspeak(spk); rspeak(CANT_POUR);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
if (HERE(URN) && game.prop[URN] == URN_EMPTY) if (HERE(URN) && game.prop[URN] == URN_EMPTY)
return fill(verb, URN); return fill(verb, URN);
game.prop[BOTTLE] = EMPTY_BOTTLE; game.prop[BOTTLE] = EMPTY_BOTTLE;
game.place[obj] = LOC_NOWHERE; game.place[obj] = LOC_NOWHERE;
spk = GROUND_WET;
if (!(AT(PLANT) || AT(DOOR))) { if (!(AT(PLANT) || AT(DOOR))) {
rspeak(spk); rspeak(GROUND_WET);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
if (!AT(DOOR)) { if (!AT(DOOR)) {
spk = SHAKING_LEAVES;
if (obj != WATER) { if (obj != WATER) {
rspeak(spk); rspeak(SHAKING_LEAVES);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
pspeak(PLANT, look, game.prop[PLANT] + 3, true); pspeak(PLANT, look, game.prop[PLANT] + 3, true);