From 2abe156516cc5f1045f1cf32e2723f9ec9e88f56 Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Fri, 26 May 2023 14:03:48 -0700
Subject: [PATCH] potion of gain level tweak

Eliminate a use of non-literal format string and consequent need to
manipulate compiler warning settings.  Should be no change in behavior.
---
 src/potion.c | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/potion.c b/src/potion.c
index 23bc51e90..ac5f48975 100644
--- a/src/potion.c
+++ b/src/potion.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	potion.c	$NHDT-Date: 1629497464 2021/08/20 22:11:04 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.201 $ */
+/* NetHack 3.7	potion.c	$NHDT-Date: 1685135014 2023/05/26 21:03:34 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.238 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1055,35 +1055,33 @@ peffect_blindness(struct obj *otmp)
                  (boolean) !Blind);
 }
 
-DISABLE_WARNING_FORMAT_NONLITERAL
-
 static void
 peffect_gain_level(struct obj *otmp)
 {
     if (otmp->cursed) {
+        boolean on_lvl_1 = (ledger_no(&u.uz) == 1);
+
         gp.potion_unkn++;
         /* they went up a level */
-        if ((ledger_no(&u.uz) == 1 && u.uhave.amulet)
-            || Can_rise_up(u.ux, u.uy, &u.uz)) {
-            static const char riseup[] = "rise up, through the %s!";
+        if (on_lvl_1 ? u.uhave.amulet : Can_rise_up(u.ux, u.uy, &u.uz)) {
+            int newlev;
+            d_level newlevel;
 
-            if (ledger_no(&u.uz) == 1) {
-                You(riseup, ceiling(u.ux, u.uy));
-                goto_level(&earth_level, FALSE, FALSE, FALSE);
+            if (on_lvl_1) {
+                assign_level(&newlevel, &earth_level);
             } else {
-                int newlev = depth(&u.uz) - 1;
-                d_level newlevel;
-
+                newlev = depth(&u.uz) - 1;
                 get_level(&newlevel, newlev);
                 if (on_level(&newlevel, &u.uz)) {
                     pline("It tasted bad.");
                     return;
-                } else
-                    You(riseup, ceiling(u.ux, u.uy));
-                goto_level(&newlevel, FALSE, FALSE, FALSE);
+                }
             }
-        } else
+            You("rise up, through the %s!", ceiling(u.ux, u.uy));
+            goto_level(&newlevel, FALSE, FALSE, FALSE);
+        } else {
             You("have an uneasy feeling.");
+        }
         return;
     }
     pluslvl(FALSE);
@@ -1093,8 +1091,6 @@ peffect_gain_level(struct obj *otmp)
         u.uexp = rndexp(TRUE);
 }
 
-RESTORE_WARNING_FORMAT_NONLITERAL
-
 static void
 peffect_healing(struct obj *otmp)
 {