Optimize CBA_fnc_getActiveFeatureCamera

CBATeam · Sep 14, 2018 · 9e07b1c · jonpas · Sep 14, 2018 · jonpas
1 parent 99f32e7
commit 9e07b1c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
@@ -23,14 +23,23 @@ GVAR(delayless_loop) = QUOTE(PATHTOF(delayless_loop.fsm));
 
 // Initialize Components
 GVAR(groups) = [grpNull, grpNull, grpNull, grpNull, grpNull];
-GVAR(featureCameras) = [
-    ["curator", {!isNull curatorCamera}], // Curator
-    ["nexus", {!isNull (missionNamespace getVariable ["BIS_EGSpectatorCamera_camera", objNull])}], // BIS Nexus Spectator
-    ["arsenal", {!isNull (uiNamespace getVariable ["BIS_fnc_arsenal_cam", objNull])}], // Arsenal camera
-    ["establishing", {!isNull (missionNamespace getVariable ["BIS_fnc_establishingShot_fakeUAV", objNull])}], // Establishing shot camera
-    ["splendid", {!isNull (missionNamespace getVariable ["BIS_fnc_camera_cam", objNull])}], // Splendid camera
-    ["animViewer", {!isNull (uiNamespace getVariable ["BIS_fnc_animViewer_cam", objNull])}], // Animation viewer camera
-    ["classic", {!isNull (missionNamespace getVariable ["BIS_DEBUG_CAM", objNull])}] // Classic camera
+GVAR(featureCamerasCode) = [
+    {!isNull curatorCamera}, // Curator
+    {!isNull (missionNamespace getVariable ["BIS_EGSpectatorCamera_camera", objNull])}, // BIS Nexus Spectator
+    {!isNull (uiNamespace getVariable ["BIS_fnc_arsenal_cam", objNull])}, // Arsenal camera
+    {!isNull (missionNamespace getVariable ["BIS_fnc_establishingShot_fakeUAV", objNull])}, // Establishing shot camera
+    {!isNull (missionNamespace getVariable ["BIS_fnc_camera_cam", objNull])}, // Splendid camera
+    {!isNull (uiNamespace getVariable ["BIS_fnc_animViewer_cam", objNull])}, // Animation viewer camera
+    {!isNull (missionNamespace getVariable ["BIS_DEBUG_CAM", objNull])} // Classic camera
+];
+GVAR(featureCamerasNames) = [
+    "curator", // Curator
+    "nexus", // BIS Nexus Spectator
+    "arsenal", // Arsenal camera
+    "establishing", // Establishing shot camera
+    "splendid", // Splendid camera
+    "animViewer", // Animation viewer camera
+    "classic" // Classic camera
 ];
 
 call COMPILE_FILE(init_gauss);

diff --git a/addons/common/fnc_getActiveFeatureCamera.sqf b/addons/common/fnc_getActiveFeatureCamera.sqf
@@ -32,9 +32,4 @@ Author:
 ---------------------------------------------------------------------------- */
 SCRIPT(getActiveFeatureCamera);
 
-{
-     _x params ["_name", "_callback"];
-
-    if (call _callback) exitWith {_name};
-    ""
-} forEach GVAR(featureCameras);
+GVAR(featureCamerasNames) param [GVAR(featureCamerasCode) findIf {call _x}, "none"]
diff --git a/addons/common/fnc_registerFeatureCamera.sqf b/addons/common/fnc_registerFeatureCamera.sqf
@@ -37,4 +37,7 @@ if (_callback isEqualTo false) exitWith {
     false
 };
 
-(GVAR(featureCameras) pushBackUnique _this) != -1 // return
+GVAR(featureCamerasNames) pushBack _name;
+GVAR(featureCamerasCode) pushBack _callback;
+
+true