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

Localized spk in discard

Browse source
This commit is contained in:
NHOrus 2017-07-04 19:45:00 +03:00
parent 733b035933
commit 92de4856a6
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
actions.c
View file

@ -447,12 +447,11 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
* bird (might attack snake or dragon) and cage (might contain bird) and vase. * bird (might attack snake or dragon) and cage (might contain bird) and vase.
* Drop coins at vending machine for extra batteries. */ * Drop coins at vending machine for extra batteries. */
{ {
int spk = actions[verb].message;
if (!just_do_it) { if (!just_do_it) {
if (TOTING(ROD2) && obj == ROD && !TOTING(ROD)) if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))
obj = ROD2; obj = ROD2;
if (!TOTING(obj)) { if (!TOTING(obj)) {
rspeak(spk); rspeak(actions[verb].message;);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
if (obj == BIRD && HERE(SNAKE)) { if (obj == BIRD && HERE(SNAKE)) {
@ -469,7 +468,7 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
game.prop[CAVITY] = CAVITY_FULL; game.prop[CAVITY] = CAVITY_FULL;
if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) || if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) ||
(obj == RUBY && game.prop[RUG] == RUG_HOVER))) { (obj == RUBY && game.prop[RUG] == RUG_HOVER))) {
spk = RUG_RISES; int spk = RUG_RISES;
if (TOTING(RUG)) if (TOTING(RUG))
spk = RUG_WIGGLES; spk = RUG_WIGGLES;
if (obj == RUBY) if (obj == RUBY)
@ -515,7 +514,7 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
int k = LIQUID(); int k = LIQUID();
if (k == obj) if (k == obj)
obj = BOTTLE; obj = BOTTLE;
if (obj == BOTTLE && k != 0) if (obj == BOTTLE && k != NO_OBJECT)
game.place[k] = LOC_NOWHERE; game.place[k] = LOC_NOWHERE;
if (obj == CAGE && game.prop[BIRD] == BIRD_CAGED) if (obj == CAGE && game.prop[BIRD] == BIRD_CAGED)
drop(BIRD, game.loc); drop(BIRD, game.loc);