last try for tonight: engrave.c and hack.c

diff --git a/src/engrave.c b/src/engrave.c
index 1a7592575d5ed34332137018d5a0f8854198bb1a..f54929a7c404135b7197fc0f705a8188597bb2ab 100644 (file)
--- a/src/engrave.c
+++ b/src/engrave.c
@@ -923,7 +923,7 @@ doengrave()
                c = yn_function("Do you want to add to the current engraving?",
                                ynqchars, 'y');
                if (c == 'q') {
-                   pline("%s", Never_mind);
+                   pline1(Never_mind);
                    return(0);
                }
            }
@@ -1016,7 +1016,7 @@ doengrave()
                          Tobjnam(otmp, "glow"), otense(otmp, "fade"));
                return(1);
            } else {
-               pline("%s", Never_mind);
+               pline1(Never_mind);
                return(0);
            }
        }
@@ -1127,12 +1127,12 @@ doengrave()
 
        make_engr_at(u.ux, u.uy, buf, (moves - multi), type);
 
-       if (post_engr_text[0]) pline(post_engr_text);
+       if (post_engr_text[0]) pline1(post_engr_text);
 
        if (doblind && !resists_blnd(&youmonst)) {
            You("are blinded by the flash!");
            make_blinded((long)rnd(50),FALSE);
-           if (!Blind) Your(vision_clears);
+           if (!Blind) Your1(vision_clears);
        }
 
        return(1);

diff --git a/src/hack.c b/src/hack.c
index ce3e2ae6b1c6c23a807d7b8752d02ea45f8763b9..30f26c969dd8c9d689db4ba97aafbb9e0a60c2b6 100644 (file)
--- a/src/hack.c
+++ b/src/hack.c
@@ -471,7 +471,7 @@ still_chewing(x,y)
 
     unblock_point(x, y);       /* vision */
     newsym(x, y);
-    if (digtxt) You(digtxt);   /* after newsym */
+    if (digtxt) You1(digtxt);  /* after newsym */
     if (dmgtxt) pay_for_damage(dmgtxt, FALSE);
     (void) memset((genericptr_t)&context.digging, 0, sizeof(struct dig_info));
     return 0;
@@ -1844,7 +1844,7 @@ boolean pick;
                };
                long time_left = spot_time_left(u.ux, u.uy, MELT_ICE_AWAY);
                if (time_left && time_left < 15L)
-                       pline("%s",
+                       pline1(
                            (time_left < 5L)  ? icewarnings[2] :
                            (time_left < 10L) ? icewarnings[1] : icewarnings[0]);                                   
        }
@@ -2427,7 +2427,7 @@ const char *msg_override;
        multi = 0;      /* caller will usually have done this already */
        if (msg_override) nomovemsg = msg_override;
        else if (!nomovemsg) nomovemsg = You_can_move_again;
-       if (*nomovemsg) pline(nomovemsg);
+       if (*nomovemsg) pline1(nomovemsg);
        nomovemsg = 0;
        u.usleep = 0;
        if (afternmv) (*afternmv)();
@@ -2600,7 +2600,7 @@ const char *str;
 {
     if(near_capacity() >= EXT_ENCUMBER) {
        if(str)
-           pline(str);
+           pline1(str);
        else
            You_cant("do that while carrying so much stuff.");
        return 1;