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

Code simplification.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-13 11:12:38 -04:00
parent 95e8752252
commit c9abf8243c
1 changed files with 19 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

46
actions.c
View file

@ -470,57 +470,39 @@ static int feed(token_t verb, token_t obj)
RSPEAK(100); RSPEAK(100);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
else if (obj == SNAKE || obj == DRAGON || obj == TROLL) {
if (!(obj != SNAKE && obj != DRAGON && obj != TROLL)) {
int spk=102; int spk=102;
if (obj == DRAGON && game.prop[DRAGON] != 0)spk=110; if (obj == DRAGON && game.prop[DRAGON] != 0)spk=110;
if (obj == TROLL)spk=182; if (obj == TROLL)spk=182;
if (obj != SNAKE || game.closed || !HERE(BIRD)) if (obj == SNAKE && !game.closed && HERE(BIRD)) {
{
RSPEAK(spk);
return GO_CLEAROBJ;
}
DSTROY(BIRD); DSTROY(BIRD);
game.prop[BIRD]=0; game.prop[BIRD]=0;
RSPEAK(101); spk = 101;
return GO_CLEAROBJ;
} }
if (obj == DWARF) {
if (!HERE(FOOD))
{
RSPEAK(spk);
return GO_CLEAROBJ;
} }
game.dflag=game.dflag+2; else if (obj == DWARF) {
RSPEAK(103); if (HERE(FOOD)) {
return GO_CLEAROBJ; game.dflag += 2;
spk = 103;
} }
}
if (obj == BEAR) { else if (obj == BEAR) {
if (game.prop[BEAR] == 0)spk=102; if (game.prop[BEAR] == 0)spk=102;
if (game.prop[BEAR] == 3)spk=110; if (game.prop[BEAR] == 3)spk=110;
if (!HERE(FOOD)) { if (HERE(FOOD)) {
RSPEAK(spk);
return GO_CLEAROBJ;
}
DSTROY(FOOD); DSTROY(FOOD);
game.prop[BEAR]=1; game.prop[BEAR]=1;
game.fixed[AXE]=0; game.fixed[AXE]=0;
game.prop[AXE]=0; game.prop[AXE]=0;
spk=168; spk=168;
RSPEAK(spk);
return GO_CLEAROBJ;
} }
}
if (obj == OGRE) { else if (obj == OGRE) {
if (HERE(FOOD)) if (HERE(FOOD))
spk=202; spk=202;
RSPEAK(spk); } else {
return GO_CLEAROBJ;
}
spk=14; spk=14;
}
RSPEAK(spk); RSPEAK(spk);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }