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

fix #4024 - C++ complaint about enum arithmatic

Browse Source 
Not tested with a compiler that cares.  Still builds with Qt4 and an
older one.
This commit is contained in:
PatR
2023-10-31 01:49:09 -07:00
parent 6303141f1d
commit 4ecc798d20
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/display.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 display.h $NHDT-Date: 1661295667 2022/08/23 23:01:07 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.77 $ */ /* NetHack 3.7 display.h $NHDT-Date: 1698741423 2023/10/31 08:37:03 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.95 $ */
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */ /* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
/* and Dave Cohrs, 1990. */ /* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -182,9 +182,13 @@
* Respectively return a random monster or object. * Respectively return a random monster or object.
* random_object() won't return STRANGE_OBJECT or the generic objects. * random_object() won't return STRANGE_OBJECT or the generic objects.
* -/+ MAXOCLASSES is used to skip it and them. * -/+ MAXOCLASSES is used to skip it and them.
* NUM_OBJECTS and MAXOCLASSES are from different enum lists and recent C++
* (for the Qt interface) complains about mixing them in arithmatic so cast
* them to int here. Doesn't impact compiling random_object() with C.
*/ */
#define random_monster(rng) ((*rng)(NUMMONS)) #define random_monster(rng) ((*rng)(NUMMONS))
#define random_object(rng) ((*rng)(NUM_OBJECTS - MAXOCLASSES) + MAXOCLASSES) #define random_object(rng) \
((*rng)((int) NUM_OBJECTS - (int) MAXOCLASSES) + (int) MAXOCLASSES)
/* /*
* what_obj() * what_obj()