chore: Addressed PR Comments

CombinedArmsGaming · Dec 5, 2024 · 43801db · 43801db
1 parent 378e092
commit 43801db
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/components/briefing/macros.hpp b/components/briefing/macros.hpp
@@ -1,9 +1,2 @@
 #include "../../macros.hpp"
-
-#define RESPAWN_MODE_NAME_TIMED "Timed"
-#define RESPAWN_MODE_NAME_TIMED_TICKETS "Timed, with Tickets"
-#define RESPAWN_MODE_NAME_TIMED_WAVES "Timed Waves"
-#define RESPAWN_MODE_NAME_TICKETS "Tickets"
-#define RESPAWN_MODE_NAME_TIMED_WAVES_TICKETS "Timed Waves, with Tickets"
-#define RESPAWN_MODE_NAME_TRIGGERED_WAVES "Triggered Waves"
-#define RESPAWN_MODE_NAME_TRIGGERED_WAVES_TICKETS "Triggered Waves, with Tickets"
+#include "../../respawn_macros.hpp"
diff --git a/respawn_macros.hpp b/respawn_macros.hpp
@@ -15,4 +15,12 @@
 
 #define RESPAWN_DEFAULTS "CAFE_FixPlayerTickets", "CAFE_WeaponSafety", "Counter", "CAFE_Loadout", "CAFE_Squad", "CAFE_MoveToSpawn"
 
-#define DEFAULT_RESPAWN_ARRAY {RESPAWN_DEFAULTS}
+#define DEFAULT_RESPAWN_ARRAY {RESPAWN_DEFAULTS}
+
+#define RESPAWN_MODE_NAME_TIMED "Timed"
+#define RESPAWN_MODE_NAME_TIMED_TICKETS "Timed, with Tickets"
+#define RESPAWN_MODE_NAME_TIMED_WAVES "Timed Waves"
+#define RESPAWN_MODE_NAME_TICKETS "Tickets"
+#define RESPAWN_MODE_NAME_TIMED_WAVES_TICKETS "Timed Waves, with Tickets"
+#define RESPAWN_MODE_NAME_TRIGGERED_WAVES "Triggered Waves"
+#define RESPAWN_MODE_NAME_TRIGGERED_WAVES_TICKETS "Triggered Waves, with Tickets"