[Refactor] - New respawn system.

components/aceActions/fn_addSquadManagerActionsToClass.sqf

@@ -1,4 +1,5 @@
 #include "macros.hpp"
+#include "..\..\respawn_macros.hpp"
 
 params ["_unit"];
 
@@ -27,14 +28,19 @@ _createSquadNode =
 
         _children = [];
 
+        private _shouldShowRespawnDialog = 
+        {
+            (_player getVariable ["f_var_canUseRespawnMenu", false]) and {[RESPAWN_TRIGGERED_WAVE] call f_fnc_isRespawnModeActive}
+        };
+
         // Respawn menu action
         _action =
         [
             "CAFE_RespawnMenu",
             "Show Respawn Menu",
             "\A3\ui_f\data\igui\cfg\simpleTasks\types\getin_ca.paa",
-            {createDialog "RespawnWavesDialog";},
-            {_player getVariable ["f_var_canUseRespawnMenu", false]},
+            {createDialog "CAFE_TriggerRespawnWave_Dialog";},
+            _shouldShowRespawnDialog,
             {},
             [],
             "",

components/briefing/briefings/ca_briefing_player.sqf

@@ -5,8 +5,6 @@ _briefing = "";
 _briefing = _briefing + "
 <font size='20'>CA Player Controls</font><br/><br/>
 
-|- <execute expression=""_handle=createdialog 'RespawnWavesDialog';"">
-Respawn system</execute><br/>
 |- <execute expression=""if (serverCommandAvailable '#kick') then { [] execvm 'components\briefing\briefings\ca_briefing_admin.sqf'} else {hint 'You need to be an admin to get this!'};"">
 Give self admin menu</execute><br/>
 

components/downtime/downtime_macros.hpp

@@ -16,6 +16,6 @@
 #define PLAYER_IS_AWAITING_RESPAWN      (missionNamespace getVariable ["f_var_playerHasBeenKilled", false])
 #define PLAYER_IS_DOWN                  (IS_UNCONSCIOUS(player) or {!alive player} or {PLAYER_IS_AWAITING_RESPAWN})
 #define PLAYER_IS_GHOST                 (PLAYER_IS_AWAITING_RESPAWN and {alive player})
-#define SHOULD_DO_DOWNTIME              ((IS_UNCONSCIOUS(player) and {!HAS_OPTED_OUT}) or {!alive player} or {PLAYER_IS_AWAITING_RESPAWN})
+#define SHOULD_DO_DOWNTIME              (IS_UNCONSCIOUS(player) and {!HAS_OPTED_OUT})
 
 #define GET_SPECTATOR_CAM_ARGS(MODE)    (missionNamespace getVariable [format ["f_var_downtime_spectatorModes_%1", MODE], f_var_downtime_spectatorModes_AllowAll])

components/downtime/fn_downtimeSpectate.sqf

@@ -62,7 +62,6 @@ _whenDone =
     [false] call f_fnc_updateDowntimeSpectatorCameraModes;
 
     "CAFE_CutDowntime" cutFadeOut 0;
-    "CAFE_DowntimeRespawn" cutFadeOut 0;
 
     isNil
     {

components/downtime/functions.hpp

@@ -6,11 +6,4 @@ class downtime
     class blockSelfInteractWhileUnconscious{};
     class blockUnconsciousEffectsWhileDowntimeActive{};
     class updateDowntimeSpectatorCameraModes{};
-    class downtimeRespawnMessageMonitor{};
-};
-class downtime_ui
-{
-    file = "components\downtime\ui_functions";
-    class downtimeDead_onLoad{};
-    class downtime_respawnTitle_onLoad{};
 };

components/downtime/init_component.sqf

@@ -22,6 +22,5 @@ waitUntil
 DEBUG_PRINT_LOG("finished waiting: downtime")
 
 [] spawn f_fnc_downtimeMonitor;
-[] spawn f_fnc_downtimeRespawnMessageMonitor;
 [] spawn f_fnc_blockSelfInteractWhileUnconscious;
 [] spawn f_fnc_blockUnconsciousEffectsWhileDowntimeActive;

components/downtime/ui/titles.hpp

@@ -1,4 +1,2 @@
 
 #include "unconsciousTitle.hpp"
-#include "deadTitle.hpp"
-#include "respawnTitle.hpp"

components/downtime/ui_macros.hpp

@@ -1,7 +1,2 @@
 
 #define IDC_DOWNTIMEDEAD_SUBTITLE 1002
-
-#define IDC_DOWNTIMERESPAWN_HEADER 1000
-#define IDC_DOWNTIMERESPAWN_REASON 1002
-#define IDC_DOWNTIMERESPAWN_INSTRUCTION 1001
-#define IDC_DOWNTIMERESPAWN_DISCLAIMER 1100

components/functions.hpp

@@ -1,31 +1,31 @@
 class F
 {
 
+#include "aceActions\functions.hpp"
+#include "aiBehaviour\functions.hpp"
+#include "aiCache\functions.hpp"
+#include "aiDriver\functions.hpp"
 #include "briefing\functions.hpp"
 #include "ceasefire\functions.hpp"
+#include "downtime\functions.hpp"
+#include "endings\functions.hpp"
 #include "ftMemberMarkers\functions.hpp"
-#include "aiCache\functions.hpp"
-#include "aiDriver\functions.hpp"
-#include "radios\functions.hpp"
 #include "gearScript\functions.hpp"
+#include "gravestones\functions.hpp"
+#include "identity\functions.hpp"
+#include "joinInProgress\functions.hpp"
+#include "killTracker\functions.hpp"
+#include "logiVehicle\functions.hpp"
+#include "lootBox\functions.hpp"
+#include "mapClick\functions.hpp"
 #include "miscClient\functions.hpp"
 #include "miscShared\functions.hpp"
-#include "respawnWaves\functions.hpp"
+#include "radios\functions.hpp"
+#include "respawn\functions.hpp"
 #include "spawnNpcs\functions.hpp"
-#include "joinInProgress\functions.hpp"
-#include "mapClick\functions.hpp"
-#include "aiBehaviour\functions.hpp"
-#include "zeus_ui\functions.hpp"
-#include "aceActions\functions.hpp"
-#include "killTracker\functions.hpp"
-#include "gravestones\functions.hpp"
 #include "squadMarkers\functions.hpp"
-#include "endings\functions.hpp"
-#include "lootBox\functions.hpp"
 #include "viewDistanceEditor\functions.hpp"
-#include "downtime\functions.hpp"
-#include "identity\functions.hpp"
-#include "logiVehicle\functions.hpp"
+#include "zeus_ui\functions.hpp"
 
 
 }