X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=92ee30391dfb7e9bf349fc906a76d5052ffeb8c4;hb=f9be57a9f93da2f99f8ebe77574c0ca6da0eb54b;hp=8791293e3dbbdededbf967e824e177998fce652a;hpb=79f5701e07a81914cc4c20e60f496190d333d6e4;p=open-adventure.git

diff --git a/main.c b/main.c
index 8791293..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;
@@ -1062,18 +1065,18 @@ L2607:
             if (!((V1 != 1000 + WATER && V1 != 1000 + OIL) ||
                   (V2 != 1000 + PLANT && V2 != 1000 + DOOR))) {
                 if (AT(V2 - 1000))
-                    WD2 = MAKEWD(16152118);
+                    WD2 = MAKEWD(WORD_POUR);
             }
             if (V1 == 1000 + CAGE && V2 == 1000 + BIRD && HERE(CAGE) && HERE(BIRD))
-                WD1 = MAKEWD(301200308);
+                WD1 = MAKEWD(WORD_CATCH);
         }
 L2620:
-        if (WD1 == MAKEWD(23051920)) {
+        if (WD1 == MAKEWD(WORD_WEST)) {
             ++game.iwest;
             if (game.iwest == 10)
                 RSPEAK(W_IS_WEST);
         }
-        if (WD1 == MAKEWD( 715) && WD2 != 0) {
+        if (WD1 == MAKEWD(WORD_GO) && WD2 != 0) {
             if (++igo == 10)
                 RSPEAK(GO_UNNEEDED);
         }