From 7da8112f12a68dafe64dcd1577aa1ed551cb3d27 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 26 Feb 2016 18:03:45 +0100 Subject: [PATCH] - now that C++11 is allowed, these annoying 'narrowing conversion' warnings can finally be fixed... --- src/doomdef.h | 2 +- src/g_level.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index 3b066f8d8..12a9dbfe9 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -302,7 +302,7 @@ enum }; // [RH] Compatibility flags. -enum +enum : unsigned int { COMPATF_SHORTTEX = 1 << 0, // Use Doom's shortest texture around behavior? COMPATF_STAIRINDEX = 1 << 1, // Don't fix loop index for stair building? diff --git a/src/g_level.h b/src/g_level.h index 6e1768c3a..b6b848674 100644 --- a/src/g_level.h +++ b/src/g_level.h @@ -125,7 +125,7 @@ struct FMapOptInfo bool old; }; -enum ELevelFlags +enum ELevelFlags : unsigned int { LEVEL_NOINTERMISSION = 0x00000001, LEVEL_NOINVENTORYBAR = 0x00000002, // This effects Doom only, since it's the only one without a standard inventory bar.