nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

potion of gain level tweak

Browse Source 
Eliminate a use of non-literal format string and consequent need to
manipulate compiler warning settings.  Should be no change in behavior.
This commit is contained in:
PatR
2023-05-26 14:03:48 -07:00
parent aa63aa8d98
commit 2abe156516
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/potion.c
+14 -18
View File
@@ -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) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1055,35 +1055,33 @@ peffect_blindness(struct obj *otmp)
(boolean) !Blind); (boolean) !Blind);
} }
DISABLE_WARNING_FORMAT_NONLITERAL
static void static void
peffect_gain_level(struct obj *otmp) peffect_gain_level(struct obj *otmp)
{ {
if (otmp->cursed) { if (otmp->cursed) {
boolean on_lvl_1 = (ledger_no(&u.uz) == 1);
gp.potion_unkn++; gp.potion_unkn++;
/* they went up a level */ /* they went up a level */
if ((ledger_no(&u.uz) == 1 && u.uhave.amulet) if (on_lvl_1 ? u.uhave.amulet : Can_rise_up(u.ux, u.uy, &u.uz)) {
|| Can_rise_up(u.ux, u.uy, &u.uz)) { int newlev;
static const char riseup[] = "rise up, through the %s!"; d_level newlevel;
if (ledger_no(&u.uz) == 1) { if (on_lvl_1) {
You(riseup, ceiling(u.ux, u.uy)); assign_level(&newlevel, &earth_level);
goto_level(&earth_level, FALSE, FALSE, FALSE);
} else { } else {
int newlev = depth(&u.uz) - 1; newlev = depth(&u.uz) - 1;
d_level newlevel;
get_level(&newlevel, newlev); get_level(&newlevel, newlev);
if (on_level(&newlevel, &u.uz)) { if (on_level(&newlevel, &u.uz)) {
pline("It tasted bad."); pline("It tasted bad.");
return; 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."); You("have an uneasy feeling.");
}
return; return;
} }
pluslvl(FALSE); pluslvl(FALSE);
@@ -1093,8 +1091,6 @@ peffect_gain_level(struct obj *otmp)
u.uexp = rndexp(TRUE); u.uexp = rndexp(TRUE);
} }
RESTORE_WARNING_FORMAT_NONLITERAL
static void static void
peffect_healing(struct obj *otmp) peffect_healing(struct obj *otmp)
{ {