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

Completed unspk'ing of vcarry.

Browse source
This commit is contained in:
NHOrus 2017-07-04 19:41:06 +03:00
parent e46cbdf194
commit 733b035933
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
actions.c
View file

@ -337,7 +337,7 @@ static int vcarry(token_t verb, token_t obj)
rspeak(YOU_JOKING); rspeak(YOU_JOKING);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
int spk;
if (obj == WATER || if (obj == WATER ||
obj == OIL) { obj == OIL) {
if (!HERE(BOTTLE) || if (!HERE(BOTTLE) ||
@ -355,23 +355,24 @@ static int vcarry(token_t verb, token_t obj)
obj = BOTTLE; obj = BOTTLE;
} }
spk = CARRY_LIMIT;
if (game.holdng >= INVLIMIT) { if (game.holdng >= INVLIMIT) {
rspeak(spk); rspeak(CARRY_LIMIT);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} else if (obj == BIRD && game.prop[BIRD] != BIRD_CAGED && -1 - game.prop[BIRD] != BIRD_CAGED) {
}
if (obj == BIRD && game.prop[BIRD] != BIRD_CAGED && -1 - game.prop[BIRD] != BIRD_CAGED) {
if (game.prop[BIRD] == BIRD_FOREST_UNCAGED) { if (game.prop[BIRD] == BIRD_FOREST_UNCAGED) {
DESTROY(BIRD); DESTROY(BIRD);
rspeak(BIRD_CRAP); rspeak(BIRD_CRAP);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
if (!TOTING(CAGE)) if (!TOTING(CAGE)) {
spk = CANNOT_CARRY; rspeak(CANNOT_CARRY);
if (TOTING(ROD)) return GO_CLEAROBJ;
spk = BIRD_EVADES; }
if (spk == CANNOT_CARRY || if (TOTING(ROD)) {
spk == BIRD_EVADES) { rspeak(BIRD_EVADES);
rspeak(spk);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
game.prop[BIRD] = BIRD_CAGED; game.prop[BIRD] = BIRD_CAGED;