if (game.place[EGGS]==PLAC[EGGS] || (TOTING(EGGS) && game.loc==PLAC[EGGS])) {
RSPEAK(spk);
return GO_CLEAROBJ;
+ } else {
+ /* Bring back troll if we steal the eggs back from him before
+ * crossing. */
+ if (game.place[EGGS]==0 && game.place[TROLL]==0 && game.prop[TROLL]==0)
+ game.prop[TROLL]=1;
+ k=2;
+ if (HERE(EGGS))k=1;
+ if (game.loc == PLAC[EGGS])k=0;
+ MOVE(EGGS,PLAC[EGGS]);
+ PSPEAK(EGGS,k);
+ return GO_CLEAROBJ;
}
- /* Bring back troll if we steal the eggs back from him before
- * crossing. */
- if (game.place[EGGS]==0 && game.place[TROLL]==0 && game.prop[TROLL]==0)
- game.prop[TROLL]=1;
- k=2;
- if (HERE(EGGS))k=1;
- if (game.loc == PLAC[EGGS])k=0;
- MOVE(EGGS,PLAC[EGGS]);
- PSPEAK(EGGS,k);
- return GO_CLEAROBJ;
}
}
return(8000);
if (obj != BLOOD) {
if (obj != 0 && obj != WATER)spk=110;
- if (spk == 110 || LIQUID() != WATER || !HERE(BOTTLE)) {
- RSPEAK(spk);
- return GO_CLEAROBJ;
+ if (spk != 110 && LIQUID() == WATER && HERE(BOTTLE)) {
+ game.prop[BOTTLE]=1;
+ game.place[WATER]=0;
+ spk=74;
}
- game.prop[BOTTLE]=1;
- game.place[WATER]=0;
- spk=74;
} else {
DSTROY(BLOOD);
game.prop[DRAGON]=2;