FINAL_MENU_SPEC helper define added

profezzorn · Aug 4, 2024 · 64604f3 · 64604f3
1 parent 9e2c3a6
commit 64604f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/props/prop_base.h b/props/prop_base.h
@@ -1157,7 +1157,7 @@ class PropBase : CommandParser, Looper, protected SaberBase, public ModeInterfac
 #endif
 
   void EnterMenu() {
-    pushMode<MKSPEC<FINAL_MENU_SPEC_TEMPLATE>::MENU_SPEC_MENU>();
+    pushMode<FINAL_MENU_SPEC::MENU_SPEC_MENU>();
   }
 #endif
 

diff --git a/sound/sound_library.h b/sound/sound_library.h
@@ -606,5 +606,9 @@ struct UpgradeSoundLibraryIfNeeded {
 #  define FINAL_MENU_SPEC_TEMPLATE MAKE_SOUND_LIBRARY<SL_TEMPLATE_NAME>::SL_SPEC
 #endif
 
+// These two defines are the ones props should use.
+#undef FINAL_MENU_SPEC
+#define FINAL_MENU_SPEC MKSPEC<FINAL_MENUSPEC_TEMPLATE>
+
 #undef sound_library_
 #define sound_library_ (*getPtr<MKSPEC<FINAL_MENU_SPEC_TEMPLATE>::SoundLibrary>())
-Original file line number
+Diff line change
@@ Expand Up @@
     #endif
       void EnterMenu() {
-        pushMode<MKSPEC<FINAL_MENU_SPEC_TEMPLATE>::MENU_SPEC_MENU>();
+        pushMode<FINAL_MENU_SPEC::MENU_SPEC_MENU>();
       }
     #endif
@@ Expand Down @@