From f9be57a9f93da2f99f8ebe77574c0ca6da0eb54b Mon Sep 17 00:00:00 2001 From: Peje Nilsson Date: Mon, 19 Jun 2017 23:44:03 +0200 Subject: [PATCH] Cleanup Arithmetic on message number --- main.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index f79c68c..92ee303 100644 --- a/main.c +++ b/main.c @@ -457,12 +457,15 @@ static bool dwarfmove(void) if (attack == 0) return true; if (game.dflag == 2)game.dflag = 3; - SETPRM(1, attack, 0); - int k = 6; - if (attack > 1)k = THROWN_KNIVES; - RSPEAK(k); - SETPRM(1, stick, 0); - RSPEAK(k + 1 + 2 / (1 + stick)); /* FIXME: Arithmetic on message number */ + if (attack > 1){ + SETPRM(1, attack, 0); + RSPEAK(THROWN_KNIVES); + SETPRM(1, stick, 0); + RSPEAK(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT)); + } else { + RSPEAK(KNIFE_THROWN); + RSPEAK(MISSES_YOU); + } if (stick == 0) return true; game.oldlc2 = game.loc; -- 2.31.1