From e88126cf6f32aeb1daee17bf109f221dedabee2e Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 26 Nov 2021 21:52:38 -0800 Subject: [PATCH] format issues Fix a couple of things that prototyping pline() with FORMAT_F(1,2) pointed out. The mkobj.c one looks familiar; I thought it had already been fixed. Maybe it matches a pull request that hasn't been incorporated yet. --- src/mkobj.c | 4 ++-- src/read.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mkobj.c b/src/mkobj.c index 1665bca24..9fd078bb7 100644 --- a/src/mkobj.c +++ b/src/mkobj.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 mkobj.c $NHDT-Date: 1629403671 2021/08/19 20:07:51 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.205 $ */ +/* NetHack 3.7 mkobj.c $NHDT-Date: 1637992348 2021/11/27 05:52:28 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.222 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Derek S. Ray, 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1310,7 +1310,7 @@ start_glob_timeout( long when) /* when to shrink; if 0L, use random value close to 25 */ { if (!obj->globby) { - impossible("start_glob_timeout for non-glob [%s: %s]?", + impossible("start_glob_timeout for non-glob [%d: %s]?", obj->otyp, simpleonames(obj)); return; /* skip timer creation */ } diff --git a/src/read.c b/src/read.c index 2f69fa985..23c435133 100644 --- a/src/read.c +++ b/src/read.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 read.c $NHDT-Date: 1615760296 2021/03/14 22:18:16 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.220 $ */ +/* NetHack 3.7 read.c $NHDT-Date: 1637992351 2021/11/27 05:52:31 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.229 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2767,7 +2767,7 @@ do_stinking_cloud(struct obj *sobj, boolean mention_stinking) cc.y = u.uy; getpos_sethilite(display_stinking_cloud_positions, can_center_cloud); if (getpos(&cc, TRUE, "the desired position") < 0) { - pline(Never_mind); + pline1(Never_mind); return; } else if (!can_center_cloud(cc.x, cc.y)) { if (Hallucination)