Merge pull request #6 from leggettc18/GetCheckFromActor-refactor

Fixes non-windows build errors
leggettc18 · Oct 15, 2022 · aab9eb0 · aab9eb0
2 parents 1e2d9ab + 084747b
commit aab9eb0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/soh/include/z64actor.h b/soh/include/z64actor.h
@@ -348,10 +348,14 @@ typedef enum {
 #define DEFINE_ACTOR_UNSET(enum) enum,
 #define DEFINE_ACTOR(_0, enum, _2) DEFINE_ACTOR_INTERNAL(_0, enum, _2)
 
-typedef enum ActorID {
+#ifdef __cplusplus
+enum ActorID : int {
+#else
+enum ActorID {
+#endif
     #include "tables/actor_table.h"
     /* 0x0192 */ ACTOR_ID_MAX // originally "ACTOR_DLF_MAX"
-} ActorID;
+};
 
 #undef DEFINE_ACTOR
 #undef DEFINE_ACTOR_INTERNAL

diff --git a/soh/include/z64scene.h b/soh/include/z64scene.h
@@ -303,7 +303,11 @@ typedef union {
     SCmdAltHeaders        altHeaders;
 } SceneCmd; // size = 0x8
 
-typedef enum SceneID {
+#ifdef __cplusplus
+enum SceneID : int {
+#else
+enum SceneID {
+#endif
     /* 0x00 */ SCENE_YDAN,
     /* 0x01 */ SCENE_DDAN,
     /* 0x02 */ SCENE_BDAN,
@@ -416,7 +420,7 @@ typedef enum SceneID {
     /* 0x6C */ SCENE_SASATEST,
     /* 0x6D */ SCENE_TESTROOM,
     /* 0x6E */ SCENE_ID_MAX
-} SceneID;
+};
 
 // Scene commands