Code simplification.
This commit is contained in:
parent
95e8752252
commit
c9abf8243c
1 changed files with 19 additions and 37 deletions
46
actions.c
46
actions.c
|
@ -470,57 +470,39 @@ static int feed(token_t verb, token_t obj)
|
|||
RSPEAK(100);
|
||||
return GO_CLEAROBJ;
|
||||
}
|
||||
|
||||
if (!(obj != SNAKE && obj != DRAGON && obj != TROLL)) {
|
||||
else if (obj == SNAKE || obj == DRAGON || obj == TROLL) {
|
||||
int spk=102;
|
||||
if (obj == DRAGON && game.prop[DRAGON] != 0)spk=110;
|
||||
if (obj == TROLL)spk=182;
|
||||
if (obj != SNAKE || game.closed || !HERE(BIRD))
|
||||
{
|
||||
RSPEAK(spk);
|
||||
return GO_CLEAROBJ;
|
||||
}
|
||||
if (obj == SNAKE && !game.closed && HERE(BIRD)) {
|
||||
DSTROY(BIRD);
|
||||
game.prop[BIRD]=0;
|
||||
RSPEAK(101);
|
||||
return GO_CLEAROBJ;
|
||||
spk = 101;
|
||||
}
|
||||
|
||||
if (obj == DWARF) {
|
||||
if (!HERE(FOOD))
|
||||
{
|
||||
RSPEAK(spk);
|
||||
return GO_CLEAROBJ;
|
||||
}
|
||||
game.dflag=game.dflag+2;
|
||||
RSPEAK(103);
|
||||
return GO_CLEAROBJ;
|
||||
else if (obj == DWARF) {
|
||||
if (HERE(FOOD)) {
|
||||
game.dflag += 2;
|
||||
spk = 103;
|
||||
}
|
||||
|
||||
if (obj == BEAR) {
|
||||
}
|
||||
else if (obj == BEAR) {
|
||||
if (game.prop[BEAR] == 0)spk=102;
|
||||
if (game.prop[BEAR] == 3)spk=110;
|
||||
if (!HERE(FOOD)) {
|
||||
RSPEAK(spk);
|
||||
return GO_CLEAROBJ;
|
||||
}
|
||||
if (HERE(FOOD)) {
|
||||
DSTROY(FOOD);
|
||||
game.prop[BEAR]=1;
|
||||
game.fixed[AXE]=0;
|
||||
game.prop[AXE]=0;
|
||||
spk=168;
|
||||
RSPEAK(spk);
|
||||
return GO_CLEAROBJ;
|
||||
}
|
||||
|
||||
if (obj == OGRE) {
|
||||
}
|
||||
else if (obj == OGRE) {
|
||||
if (HERE(FOOD))
|
||||
spk=202;
|
||||
RSPEAK(spk);
|
||||
return GO_CLEAROBJ;
|
||||
}
|
||||
|
||||
} else {
|
||||
spk=14;
|
||||
}
|
||||
RSPEAK(spk);
|
||||
return GO_CLEAROBJ;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue