- } else if (obj == BEAR)
- /* FIXME: Arithmetic on message numbers */
- spk = BEAR_HANDS + (game.prop[BEAR] + 1) / 2;
- else if (obj == DRAGON && game.prop[DRAGON] == 0) {
+ } else if (obj == BEAR) {
+ switch (game.prop[BEAR]) {
+ case UNTAMED_BEAR: spk = BEAR_HANDS; break;
+ case SITTING_BEAR: spk = BEAR_CONFUSED; break;
+ case CONTENTED_BEAR: spk = BEAR_CONFUSED; break;
+ case BEAR_DEAD: spk = ALREADY_DEAD; break;
+ }
+ } else if (obj == DRAGON && game.prop[DRAGON] == 0) {