From ec55b04ace1f8b0cbf36639305f563fe0f213f69 Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 11 Jan 2022 17:00:31 -0500 Subject: [PATCH] macro argument monnum_to_glyph MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In file included from ../include/hack.h:217, from ../win/Qt/qt_plsel.cpp:18: ../win/Qt/qt_plsel.cpp: In member function ‘void nethack_qt_::NetHackQtPlayerSelector::populate_roles()’: ../win/Qt/qt_plsel.cpp:378:53: warning: enumerated and non-enumerated type in conditional expression [-Wextra] 378 | gf = monnum_to_glyph(roles[i].malenum, is_f ? FEMALE : MALE); ../include/display.h:610:27: note: in definition of macro ‘monnum_to_glyph’ 610 | ((gnd == MALE) ? GLYPH_MON_MALE_OFF : GLYPH_MON_FEM_OFF)) | ^~~ ../win/Qt/qt_plsel.cpp: In member function ‘void nethack_qt_::NetHackQtPlayerSelector::populate_races()’: ../win/Qt/qt_plsel.cpp:407:53: warning: enumerated and non-enumerated type in conditional expression [-Wextra] 407 | gf = monnum_to_glyph(races[j].malenum, is_f ? FEMALE : MALE); ../include/display.h:610:27: note: in definition of macro ‘monnum_to_glyph’ 610 | ((gnd == MALE) ? GLYPH_MON_MALE_OFF : GLYPH_MON_FEM_OFF)) | ^~~ --- include/display.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/display.h b/include/display.h index 569f127bd..715efce1c 100644 --- a/include/display.h +++ b/include/display.h @@ -607,13 +607,13 @@ enum glyph_offsets { /* MRKR: ...and the generic statue */ #define objnum_to_glyph(onum) ((int) (onum) + GLYPH_OBJ_OFF) #define monnum_to_glyph(mnum,gnd) ((int) (mnum) + \ - ((gnd == MALE) ? GLYPH_MON_MALE_OFF : GLYPH_MON_FEM_OFF)) + (((gnd) == MALE) ? GLYPH_MON_MALE_OFF : GLYPH_MON_FEM_OFF)) #define detected_monnum_to_glyph(mnum,gnd) ((int) (mnum) + \ - ((gnd == MALE) ? GLYPH_DETECT_MALE_OFF : GLYPH_DETECT_FEM_OFF)) + (((gnd) == MALE) ? GLYPH_DETECT_MALE_OFF : GLYPH_DETECT_FEM_OFF)) #define ridden_monnum_to_glyph(mnum,gnd) ((int) (mnum) + \ - ((gnd == MALE) ? GLYPH_RIDDEN_MALE_OFF : GLYPH_RIDDEN_FEM_OFF)) + (((gnd) == MALE) ? GLYPH_RIDDEN_MALE_OFF : GLYPH_RIDDEN_FEM_OFF)) #define petnum_to_glyph(mnum,gnd) ((int) (mnum) + \ - ((gnd == MALE) ? GLYPH_PET_MALE_OFF : GLYPH_PET_FEM_OFF)) + (((gnd) == MALE) ? GLYPH_PET_MALE_OFF : GLYPH_PET_FEM_OFF)) /* The hero's glyph when seen as a monster. */