]> granicus.if.org Git - nethack/commitdiff
Fix wrong parameter order
authorPasi Kallinen <paxed@alt.org>
Tue, 6 Sep 2016 14:35:59 +0000 (17:35 +0300)
committerPasi Kallinen <paxed@alt.org>
Tue, 6 Sep 2016 14:35:59 +0000 (17:35 +0300)
src/mhitm.c
src/mon.c

index 9836136a17abdb161e78c36b54f350370a8c0fe3..eb401fa4ea17617f1f926070edc36e2a61d380c1 100644 (file)
@@ -989,11 +989,10 @@ register struct attack *mattk;
         if (resists_acid(mdef)) {
             if (vis)
                 pline("%s is covered in %s, but it seems harmless.",
-                      hliquid("acid"),
-                      Monnam(mdef));
+                      Monnam(mdef), hliquid("acid"));
             tmp = 0;
         } else if (vis) {
-            pline("%s is covered in %s!", hliquid("acid"), Monnam(mdef));
+            pline("%s is covered in %s!", Monnam(mdef), hliquid("acid"));
             pline("It burns %s!", mon_nam(mdef));
         }
         if (!rn2(30))
@@ -1508,8 +1507,7 @@ int mdead;
             Strcpy(buf, Monnam(magr));
             if (canseemon(magr))
                 pline("%s is splashed by %s %s!", buf,
-                      hliquid("acid"),
-                      s_suffix(mon_nam(mdef)));
+                      s_suffix(mon_nam(mdef)), hliquid("acid"));
             if (resists_acid(magr)) {
                 if (canseemon(magr))
                     pline("%s is not affected.", Monnam(magr));
index 243ffbd6f8303492a1e444d6376a989cb447e3b6..e31ecb27bb28b7cd7f1a3dc9d40e45726ab41ba2 100644 (file)
--- a/src/mon.c
+++ b/src/mon.c
@@ -555,8 +555,7 @@ register struct monst *mtmp;
                 /* This can happen after a purple worm plucks you off a
                 flying steed while you are over water. */
                 pline("%s sinks as %s rushes in and flushes you out.",
-                      hliquid("water"),
-                      Monnam(mtmp));
+                      Monnam(mtmp), hliquid("water"));
             }
             mondead(mtmp);
             if (mtmp->mhp > 0) {