X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=b830d89ce187d94735f7041864563d48b0293380;hb=4b93fb327a0ae07cf931f0ebc4c9a946e4cafd6c;hp=1db050f91583e7f42bfcbb2ff9ce440c1aefc0a7;hpb=a678b68b39f21f8b2853e45c6138d815a82a3423;p=open-adventure.git

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;