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

pager warning fix and formatting

Browse Source 
The mapglyph() change made a variable obsolete but it got left in
(idx = SYM_PET_OVERRIDE...).  Take it out and fix up the formatting
for the block of code that had it.
This commit is contained in:
PatR
2019-11-17 09:25:26 -08:00
parent 21e4595127
commit 9ea7b074fe
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/pager.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pager.c $NHDT-Date: 1573943502 2019/11/16 22:31:42 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.159 $ */ /* NetHack 3.6 pager.c $NHDT-Date: 1574011494 2019/11/17 17:24:54 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.161 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2018. */ /*-Copyright (c) Robert Patrick Rankin, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1039,32 +1039,33 @@ struct permonst **for_supplement;
for (j = SYM_OFF_X; j < SYM_MAX; ++j) { for (j = SYM_OFF_X; j < SYM_MAX; ++j) {
if (j == (SYM_INVISIBLE + SYM_OFF_X)) if (j == (SYM_INVISIBLE + SYM_OFF_X))
continue; /* already handled above */ continue; /* already handled above */
tmpsym = Is_rogue_level(&u.uz) ? ov_rogue_syms[j] : ov_primary_syms[j]; tmpsym = Is_rogue_level(&u.uz) ? ov_rogue_syms[j]
: ov_primary_syms[j];
if (tmpsym && sym == tmpsym) { if (tmpsym && sym == tmpsym) {
switch(j) { switch (j) {
case SYM_BOULDER + SYM_OFF_X: case SYM_BOULDER + SYM_OFF_X:
if (!found) { if (!found) {
*firstmatch = "boulder"; *firstmatch = "boulder";
Sprintf(out_str, "%s%s", prefix, an(*firstmatch)); Sprintf(out_str, "%s%s", prefix, an(*firstmatch));
found++; found++;
} else { } else {
found += append_str(out_str, "boulder"); found += append_str(out_str, "boulder");
} }
break; break;
case SYM_PET_OVERRIDE + SYM_OFF_X: case SYM_PET_OVERRIDE + SYM_OFF_X:
if (looked) { if (looked) {
int oc = 0, idx = SYM_PET_OVERRIDE + SYM_OFF_X; int oc = 0;
unsigned os = 0; unsigned os = 0;
/* convert to symbol without override in effect */ /* convert to symbol without override in effect */
(void) mapglyph(glyph, &sym, &oc, &os, (void) mapglyph(glyph, &sym, &oc, &os,
cc.x, cc.y, MG_FLAG_NOOVERRIDE); cc.x, cc.y, MG_FLAG_NOOVERRIDE);
goto check_monsters; goto check_monsters;
} }
break; break;
case SYM_HERO_OVERRIDE + SYM_OFF_X: case SYM_HERO_OVERRIDE + SYM_OFF_X:
sym = showsyms[S_HUMAN + SYM_OFF_M]; sym = showsyms[S_HUMAN + SYM_OFF_M];
goto check_monsters; goto check_monsters;
} }
} }
} }