X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=16d8f915f5660e9b8415168f9a32a82b499763ba;hb=10e53a419e13c55cd7e0ad7752e93140a9bb50fe;hp=e341d8f4d2bbcd707c8226baf6399f7d3adedc06;hpb=2fe36df4e27d318ca2df80386fa42390ace453ed;p=open-adventure.git diff --git a/main.c b/main.c index e341d8f..16d8f91 100644 --- a/main.c +++ b/main.c @@ -451,7 +451,7 @@ static bool dwarfmove(void) if (game.dtotal == 0) return true; SETPRM(1, game.dtotal, 0); - RSPEAK(DWARF_PACK + 1 / game.dtotal); /* FIXME: Arithmetic on message number */ + RSPEAK(game.dtotal == 1 ? DWARF_SINGLE : DWARF_PACK); if (attack == 0) return true; if (game.dflag == 2)game.dflag = 3; @@ -606,7 +606,7 @@ static bool playermove(token_t verb, int motion) if (motion == 29 || motion == 30)spk = BAD_DIRECTION; if (motion == 7 || motion == 36 || motion == 37)spk = UNSURE_FACING; if (motion == 11 || motion == 19)spk = NO_INOUT_HERE; - if (verb == FIND || verb == INVENT)spk = NEreplace; + if (verb == FIND || verb == INVENT)spk = NEARBY; if (motion == 62 || motion == 65)spk = NOTHING_HAPPENS; if (motion == 17)spk = WHICH_WAY; RSPEAK(spk);