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

Adapt bottle object to use state_change().

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-05 01:15:40 -04:00
parent 8613f0b3d9
commit 31c1a44915
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
actions.c
View file

@ -546,9 +546,8 @@ static int drink(token_t verb, token_t obj)
return GO_CLEAROBJ;
}
if (LIQUID() == WATER && HERE(BOTTLE)) {
game.prop[BOTTLE] = EMPTY_BOTTLE;
game.place[WATER] = LOC_NOWHERE;
rspeak(BOTTLE_EMPTY);
state_change(BOTTLE, EMPTY_BOTTLE);
return GO_CLEAROBJ;
}
@ -741,13 +740,11 @@ int fill(token_t verb, token_t obj)
return GO_CLEAROBJ;
}
game.prop[BOTTLE] = (LIQLOC(game.loc) == OIL) ? OIL_BOTTLE : WATER_BOTTLE;
state_change(BOTTLE, (LIQLOC(game.loc) == OIL)
? OIL_BOTTLE
: WATER_BOTTLE);
if (TOTING(BOTTLE))
game.place[LIQUID()] = CARRIED;
if (LIQUID() == OIL)
rspeak(BOTTLED_OIL);
else
rspeak(BOTTLED_WATER);
return GO_CLEAROBJ;
}