X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=actions.c;h=802c1f3303b6c233d8b648985b04d28fc7369b2c;hb=596a15457d897451aa8bfcf64c7c76b09836c01b;hp=46d09e1e8a84d7ee134c95aacf05bcd5485b7668;hpb=ff6a816e5f43ba542b98b79d7eea89d2bce97ee2;p=open-adventure.git diff --git a/actions.c b/actions.c index 46d09e1..802c1f3 100644 --- a/actions.c +++ b/actions.c @@ -101,14 +101,11 @@ static int attack(struct command_t *command) * fixed), move rug there (not fixed), and move him there, * too. Then do a null motion to get new description. */ rspeak(BARE_HANDS_QUERY); - if (silent_yes()) { - // FIXME: setting wd1 is a workaround for broken logic - command->wd1 = token_to_packed("Y"); - } else { - // FIXME: setting wd1 is a workaround for broken logic - command->wd1 = token_to_packed("N"); - return GO_CHECKFOO; - } + if (!silent_yes()) + { + speak(arbitrary_messages[NASTY_DRAGON]); + return GO_MOVE; + } state_change(DRAGON, DRAGON_DEAD); game.prop[RUG] = RUG_FLOOR; /* Hardcoding LOC_SECRET5 as the dragon's death location is ugly.