From 3b0560052d450f817e04e9fa833a06f62c884c15 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Tue, 31 Mar 2026 19:31:41 -0500
Subject: [PATCH] Fix bitflags enum kartspinoutflags_t for C++

---
 src/d_player.h | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index 84992a11a..4a2e5b7fe 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -245,24 +245,18 @@ typedef enum
 	KSM__MAX,
 } kartslotmachine_t;
 
-typedef enum
-{
-	KSPIN_THRUST    = (1<<0),
-	KSPIN_IFRAMES   = (1<<1),
-	KSPIN_AIRTIMER  = (1<<2),
+typedef INT32 kartspinoutflags_t;
+#define KSPIN_THRUST    (1<<0)
+#define KSPIN_IFRAMES   (1<<1)
+#define KSPIN_AIRTIMER  (1<<2)
 
-	KSPIN_TYPEBIT   = (1<<3),
-	KSPIN_TYPEMASK  = ~( KSPIN_TYPEBIT - 1 ),
+#define KSPIN_TYPEBIT   (1<<3)
+#define KSPIN_TYPEMASK  (~( KSPIN_TYPEBIT - 1 ))
 
-#define KSPIN_TYPE( type ) ( KSPIN_TYPEBIT << type )
-
-	KSPIN_SPINOUT   = KSPIN_TYPE(0)|KSPIN_IFRAMES|KSPIN_THRUST,
-	KSPIN_WIPEOUT   = KSPIN_TYPE(1)|KSPIN_IFRAMES,
-	KSPIN_STUNG     = KSPIN_TYPE(2),
-	KSPIN_EXPLOSION = KSPIN_TYPE(3)|KSPIN_IFRAMES|KSPIN_AIRTIMER,
-
-#undef KSPIN_TYPE
-} kartspinoutflags_t;
+#define KSPIN_SPINOUT   (( KSPIN_TYPEBIT << 0 )|KSPIN_IFRAMES|KSPIN_THRUST)
+#define KSPIN_WIPEOUT   (( KSPIN_TYPEBIT << 1 )|KSPIN_IFRAMES)
+#define KSPIN_STUNG     (( KSPIN_TYPEBIT << 2 ))
+#define KSPIN_EXPLOSION (( KSPIN_TYPEBIT << 3 )|KSPIN_IFRAMES|KSPIN_AIRTIMER)
 
 typedef enum
 {