address some compiler complaints

This commit is contained in:
nhmall
2026-06-26 12:30:36 -04:00
parent 5911ee19d0
commit e3407a923f
4 changed files with 10 additions and 5 deletions
+4
View File
@@ -363,11 +363,15 @@ static int optfn_##a(int, int, boolean, char *, char *);
NHOPTB(herecmd_menu, Advanced, 0, opt_in, set_in_game,
Off, Yes, No, No, NoAlias, &iflags.herecmd_menu, Term_False,
"show commands available in this location")
#if 0
/* there is no optfn_hicolor() defined in options.c presently
and that is required for NHOPTC */
#if defined(MAC68K)
NHOPTC(hicolor, Advanced, 15, opt_in, set_in_config,
No, Yes, No, No, NoAlias,
"same as palette, only order is reversed")
#endif
#endif /* 0 */
NHOPTB(hilite_pet, Map, 0, opt_in, set_in_game,
Off, Yes, No, No, NoAlias, &iflags.wc_hilite_pet, Term_False,
"use highlight for pets")
+2 -1
View File
@@ -2493,7 +2493,8 @@ handler_change_autocompletions(void)
if (strlen(ec->ef_txt) < 2)
continue;
Sprintf(buf, "%s", ec->ef_txt);
/* switched to Snprintf to eliminate -Wformat-overflow warning */
Snprintf(buf, sizeof buf, "%s", ec->ef_txt);
for (j = 0; j < n; ++j) {
if (ec == &extcmdlist[(picks[j].item.a_int - 1)]) {
+1 -1
View File
@@ -1681,7 +1681,7 @@ rndmonst_adj(int minadj, int maxadj)
if (montooweak(mndx, minmlev) || montoostrong(mndx, maxmlev))
continue;
if (upper && !isupper(monsym(ptr)))
if (upper && !isupper((int) monsym(ptr)))
continue;
if (elemlevel && wrong_elem_type(ptr))
continue;
+3 -3
View File
@@ -4868,7 +4868,7 @@ pick_animal(void)
/* rogue level should use monsters represented by uppercase letters
only, but since chameleons aren't generated there (not uppercase!)
we don't perform a lot of retries */
if (Is_rogue_level(&u.uz) && !isupper(monsym(&mons[res])))
if (Is_rogue_level(&u.uz) && !isupper((int) monsym(&mons[res])))
res = ga.animal_list[rn2(ga.animal_list_count)];
return res;
}
@@ -5224,7 +5224,7 @@ select_newcham_form(struct monst *mon)
} while (--tryct > 0 && !validspecmon(mon, mndx)
/* try harder to select uppercase monster on rogue level */
&& (tryct > 40 && Is_rogue_level(&u.uz)
&& !isupper(monsym(&mons[mndx]))));
&& !isupper((int) monsym(&mons[mndx]))));
}
return mndx;
}
@@ -5334,7 +5334,7 @@ newcham(
/* for the first several tries we require upper-case on
the rogue level (after that, we take whatever we get) */
if (tryct > 15 && Is_rogue_level(&u.uz)
&& mdat && !isupper(monsym(mdat)))
&& mdat && !isupper((int) monsym(mdat)))
mdat = 0;
if (mdat)
break;