Magic number elimination, repair some careless replace damage.

This commit is contained in:
Eric S. Raymond 2017-06-19 08:37:19 -04:00
parent df86aa283b
commit 98b02eeeb1
3 changed files with 5 additions and 5 deletions

4
main.c
View file

@ -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);