last bunch - pline warnings while testing postcommit.pl

diff --git a/src/priest.c b/src/priest.c
index 19afa5f6e4e09fb829fb8dbb19cdb97379943f87..4189aada1bb458b3fbc9e25c07faa4b0d6f34fbf 100644 (file)
--- a/src/priest.c
+++ b/src/priest.c
@@ -417,8 +417,8 @@ int roomno;
            msg1 = buf;
        }
        if (msg1 && can_speak && !Deaf) {
-           verbalize(msg1);
-           if (msg2) verbalize(msg2);
+           verbalize1(msg1);
+           if (msg2) verbalize1(msg2);
            epri_p->enter_time = moves + (long)d(10, 100);      /* ~505 */
        }
        if (!sanctum) {
@@ -525,7 +525,7 @@ register struct monst *priest;
                priest->mcanmove = 1;
            }
            priest->mpeaceful = 0;
-           verbalize(cranky_msg[rn2(3)]);
+           verbalize1(cranky_msg[rn2(3)]);
            return;
        }
 

diff --git a/src/steed.c b/src/steed.c
index ef9490b6a2e97eb46d5d381c73e6fb6fd18b6596..afa110b1f44919f39f6049c0ecbb971ee6e18675 100644 (file)
--- a/src/steed.c
+++ b/src/steed.c
@@ -59,7 +59,7 @@ use_saddle(otmp)
 
        /* Select an animal */
        if (u.uswallow || Underwater || !getdir((char *)0)) {
-           pline(Never_mind);
+           pline1(Never_mind);
            return 0;
        }
        if (!u.dx && !u.dy) {

diff --git a/src/teleport.c b/src/teleport.c
index 9ce210912859d95e08289fd9d792ae919c91c712..000784094da59784408c466dac54dc2cbf2b2f0d 100644 (file)
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -589,7 +589,7 @@ dotele()
                else tele();
                (void) next_to_u();
        } else {
-               You(shudder_for_moment);
+               You1(shudder_for_moment);
                return(0);
        }
        if (!trap) morehungry(100);
@@ -698,7 +698,7 @@ level_tele()
             * we let negative values requests fall into the "heaven" loop.
             */
            if (Is_knox(&u.uz) && newlev > 0 && !force_dest) {
-               You(shudder_for_moment);
+               You1(shudder_for_moment);
                return;
            }
            /* if in Quest, the player sees "Home 1", etc., on the status
@@ -715,7 +715,7 @@ level_tele()
  random_levtport:
            newlev = random_teleport_level();
            if (newlev == depth(&u.uz)) {
-               You(shudder_for_moment);
+               You1(shudder_for_moment);
                return;
            }
        }
@@ -724,7 +724,7 @@ level_tele()
                buried_ball_to_punishment();
 
        if (!next_to_u() && !force_dest) {
-               You(shudder_for_moment);
+               You1(shudder_for_moment);
                return;
        }
 #ifdef WIZARD
@@ -852,7 +852,7 @@ register struct trap *ttmp;
                buried_ball_to_punishment();
 
        if (!next_to_u()) {
-               You(shudder_for_moment);
+               You1(shudder_for_moment);
                return;
        }
 
@@ -886,7 +886,7 @@ struct trap *trap;
                        shieldeff(u.ux, u.uy);
                You_feel("a wrenching sensation.");
        } else if (!next_to_u()) {
-               You(shudder_for_moment);
+               You1(shudder_for_moment);
        } else if (trap->once) {
                deltrap(trap);
                newsym(u.ux,u.uy);      /* get rid of trap symbol */

diff --git a/src/timeout.c b/src/timeout.c
index 84bc8ab7c9ef43cb39268e6a442f764375d385e6..5f0e3b0477b9092e35b60e1f52b3c7e280ebeb2b 100644 (file)
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -29,7 +29,7 @@ stoned_dialogue()
        register long i = (Stoned & TIMEOUT);
 
        if (i > 0L && i <= SIZE(stoned_texts))
-               pline(stoned_texts[SIZE(stoned_texts) - i]);
+               pline1(stoned_texts[SIZE(stoned_texts) - i]);
        switch ((int) i) {
        case 5:         /* slowing down */
                HFast = 0L;
@@ -92,7 +92,7 @@ vomiting_dialogue()
                break;
        default: break; 
        }
-       if (txt) You("%s", txt);
+       if (txt) You1(txt);
        exercise(A_CON, FALSE);
 }
 
@@ -126,7 +126,7 @@ choke_dialogue()
                if (index(str, '%'))
                    pline(str, hcolor(NH_BLUE));
                else
-                   pline(str);
+                   pline1(str);
            }
        }
        exercise(A_STR, FALSE);
@@ -156,7 +156,7 @@ slime_dialogue()
                } else
                    pline(str, an(Hallucination ? rndmonnam() : "green slime"));
            } else
-               pline(str);
+               pline1(str);
        }
        if (i == 3L) {  /* limbs becoming oozy */
            HFast = 0L; /* lose intrinsic speed */

diff --git a/src/trap.c b/src/trap.c
index d3d2334bafc938bc496eac804354b262cd52e8cb..9c4ab31f476f37a41e0f06de1ecb404a57514f2b 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -400,7 +400,7 @@ boolean td; /* td == TRUE : trap door or hole */
            dont_fall = "are jerked back by your pet!";
        }
        if (dont_fall) {
-           You(dont_fall);
+           You1(dont_fall);
            /* hero didn't fall through, but any objects here might */
            impact_drop((struct obj *)0, u.ux, u.uy, 0);
            if (!td) {
@@ -2919,7 +2919,7 @@ domagictrap()
          if (!resists_blnd(&youmonst)) {
                You("are momentarily blinded by a flash of light!");
                make_blinded((long)rn1(5,10),FALSE);
-               if (!Blind) Your(vision_clears);
+               if (!Blind) Your1(vision_clears);
          } else if (!Blind) {
                You_see("a flash of light!");
          } else if (!Deaf) {

diff --git a/src/uhitm.c b/src/uhitm.c
index 786ddb250a8213dae75cd8955b0c993312cb8f3d..dd7bb4247e829a8ec91cbde1ec517b07de72381a 100644 (file)
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -1907,7 +1907,7 @@ register struct attack *mattk;
                                if (Slow_digestion) tmp *= 2;
                                nomul(-tmp);
                                nomovemsg = msgbuf;
-                           } else pline("%s", msgbuf);
+                           } else pline1(msgbuf);
                            if (pd == &mons[PM_GREEN_SLIME]) {
                                Sprintf(msgbuf, "%s isn't sitting well with you.",
                                        The(pd->mname));

diff --git a/src/version.c b/src/version.c
index fa2c45bb50738d385edafb879589d9cda4620d07..6dbc4e38aed8b93daaf2e1cd1d2a16ae35fac4ea 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -46,7 +46,7 @@ doversion()
 {
        char buf[BUFSZ];
 
-       pline("%s", getversionstring(buf));
+       pline1(getversionstring(buf));
        return 0;
 }
 

diff --git a/src/windows.c b/src/windows.c
index 3d0177c3c8bcf9abe172ac03fc3b8e286af82e89..478cd0412d06a81c3f7b83a1c7e5e5b15784e90f 100644 (file)
--- a/src/windows.c
+++ b/src/windows.c
@@ -150,7 +150,7 @@ char let;
 int how;
 const char *mesg;
 {
-    pline("%s", mesg);
+    pline1(mesg);
     return 0;
 }
 
@@ -209,7 +209,7 @@ boolean restoring;
           intact at the end of each call.
         */
 #if 0          /* maybe... */
-       if (!restoring) pline("%s", msg);
+       if (!restoring) pline1(msg);
 #endif
        return;
 }

diff --git a/src/zap.c b/src/zap.c
index f427ef9e2b360d2297d8806586d06b7c52b32b5c..7871a95536b192b4ac0e7e6974791b24c0c6e032 100644 (file)
--- a/src/zap.c
+++ b/src/zap.c
@@ -2027,7 +2027,7 @@ dozap()
        check_unpaid(obj);
 
        /* zappable addition done by GAN 11/03/86 */
-       if(!zappable(obj)) pline("%s", nothing_happens);
+       if(!zappable(obj)) pline1(nothing_happens);
        else if(obj->cursed && !rn2(WAND_BACKFIRE_CHANCE)) {
                backfire(obj);  /* the wand blows up in your face! */
                exercise(A_STR, FALSE);
@@ -2419,7 +2419,7 @@ long duration;
        if (!resists_blnd(&youmonst)) {
                You(are_blinded_by_the_flash);
                make_blinded(duration, FALSE);
-               if (!Blind) Your(vision_clears);
+               if (!Blind) Your1(vision_clears);
                return TRUE;
        }
        return FALSE;
@@ -2672,11 +2672,7 @@ struct obj *obj; /* wand or spell */
        case SPE_STONE_TO_FLESH:
            if (Is_airlevel(&u.uz) || Is_waterlevel(&u.uz) ||
                     Underwater || (Is_qstart(&u.uz) && u.dz < 0)) {
-#if 1
-               pline("%s", nothing_happens);
-#else
-               pline(nothing_happens);
-#endif
+               pline1(nothing_happens);
            } else if (u.dz < 0) {      /* we should do more... */
                pline("Blood drips on your %s.", body_part(FACE));
            } else if (u.dz > 0 && !OBJ_AT(u.ux, u.uy)) {
@@ -2687,7 +2683,7 @@ struct obj *obj;  /* wand or spell */
                e = engr_at(u.ux, u.uy);
                if (!(e && e->engr_type == ENGRAVE)) {
                    if (is_pool(u.ux, u.uy) || is_ice(u.ux, u.uy))
-                       pline("%s", nothing_happens);
+                       pline1(nothing_happens);
                    else
                        pline("Blood %ss %s your %s.",
                              is_lava(u.ux, u.uy) ? "boil" : "pool",
@@ -4252,12 +4248,12 @@ short exploding_wand_typ;
                    lev->doormask = new_doormask;
                    unblock_point(x, y);        /* vision */
                    if (see_it) {
-                       pline("%s", see_txt);
+                       pline1(see_txt);
                        newsym(x, y);
                    } else if (sense_txt) {
-                       You("%s", sense_txt);
+                       You1(sense_txt);
                    } else if (hear_txt) {
-                       if (!Deaf) You_hear("%s", hear_txt);
+                       if (!Deaf) You_hear1(hear_txt);
                    }
                    if (picking_at(x, y)) {
                        stop_occupation();
@@ -4731,7 +4727,7 @@ retry:
        if (!otmp) {
            pline("Nothing fitting that description exists in the game.");
            if (++tries < MAXWISHTRY) goto retry;
-           pline("%s", thats_enough_tries);
+           pline1(thats_enough_tries);
            otmp = readobjnam((char *)0, (struct obj *)0);
            if (!otmp) return;  /* for safety; should never happen */
        } else if (otmp == &nothing) {