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

Removed helper function

Browse source
This commit is contained in:
NHOrus 2017-07-03 05:59:57 +03:00
parent da78e7eb92
commit e1f52f4e31
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
actions.c
View file

@ -1083,16 +1083,6 @@ 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) static int wave(token_t verb, token_t obj)
/* Wave. No effect unless waving rod at fissure or at bird. */ /* Wave. No effect unless waving rod at fissure or at bird. */
{ {
@ -1111,15 +1101,15 @@ static int wave(token_t verb, token_t obj)
return GO_CLEAROBJ; return GO_CLEAROBJ;
} else { } else {
if (game.closed) { if (game.closed) {
rspeak(birdspeak()); rspeak((game.prop[BIRD] == BIRD_CAGED) ? CAGE_FLY : FREE_FLY);
return GO_DWARFWAKE; return GO_DWARFWAKE;
} }
if (game.closng || !AT(FISSURE)) { if (game.closng || !AT(FISSURE)) {
rspeak(birdspeak()); rspeak((game.prop[BIRD] == BIRD_CAGED) ? CAGE_FLY : FREE_FLY);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
if (HERE(BIRD)) if (HERE(BIRD))
rspeak(birdspeak()); rspeak((game.prop[BIRD] == BIRD_CAGED) ? CAGE_FLY : FREE_FLY);
/* FIXME: Arithemetic on property values */ /* FIXME: Arithemetic on property values */
game.prop[FISSURE] = 1 - game.prop[FISSURE]; game.prop[FISSURE] = 1 - game.prop[FISSURE];