From: Peje Nilsson <peje66@gmail.com>
Date: Mon, 19 Jun 2017 21:44:48 +0000 (+0200)
Subject: Merge branch 'master' into magic-number
X-Git-Tag: 1.1~205
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=c84d37091899d4bfcd747dd4afd182d81c3720b3;hp=9c88649cd4d2064d4f4fa0f09d6b664e2cf7cc01;p=open-adventure.git

Merge branch 'master' into magic-number
---

diff --git a/main.c b/main.c
index 1db050f..b830d89 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;