From c64ecb0d0aeba28a944b76f47967d3291f2a860b Mon Sep 17 00:00:00 2001 From: Eidolon Date: Sun, 15 Mar 2026 15:27:03 -0500 Subject: [PATCH] Fix bitflags enum itemflags_t for C++ --- src/d_player.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index e93dfeb3e..f02afa3bf 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -69,13 +69,11 @@ typedef enum PST_REBORN } playerstate_t; -typedef enum -{ - IF_USERINGS = 1, // Have to be not holding the item button to change from using rings to using items (or vice versa) - prevents weirdness - IF_ITEMOUT = 1<<1, // Are you holding an item out? - IF_EGGMANOUT = 1<<2, // Eggman mark held, separate from IF_ITEMOUT so it doesn't stop you from getting items - IF_HOLDREADY = 1<<3, // Hold button-style item is ready to activate -} itemflags_t; +typedef INT32 itemflags_t; +#define IF_USERINGS (1) // Have to be not holding the item button to change from using rings to using items (or vice versa) - prevents weirdness +#define IF_ITEMOUT (1<<1) // Are you holding an item out? +#define IF_EGGMANOUT (1<<2) // Eggman mark held, separate from IF_ITEMOUT so it doesn't stop you from getting items +#define IF_HOLDREADY (1<<3) // Hold button-style item is ready to activate // // Player internal flags