diff --git a/components/briefing/macros.hpp b/components/briefing/macros.hpp index bb7d75b..3ef84d3 100644 --- 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" \ No newline at end of file +#include "../../respawn_macros.hpp" \ No newline at end of file diff --git a/respawn_macros.hpp b/respawn_macros.hpp index 64be566..0c03431 100644 --- 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} \ No newline at end of file +#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" \ No newline at end of file