Spectator - Fix script error in ui_draw3d (#5722)

acemod · Nov 4, 2017 · c20ec65 · c20ec65
1 parent 96d9786
commit c20ec65
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/addons/spectator/functions/fnc_cam.sqf b/addons/spectator/functions/fnc_cam.sqf
@@ -17,6 +17,7 @@
 #include "script_component.hpp"
 
 params ["_init"];
+TRACE_1("cam",_init);
 
 // No change
 if (_init isEqualTo !isNil QGVAR(camera)) exitWith {};

diff --git a/addons/spectator/functions/fnc_respawnTemplate.sqf b/addons/spectator/functions/fnc_respawnTemplate.sqf
@@ -23,6 +23,7 @@
 #include "script_component.hpp"
 
 params [["_newCorpse",objNull,[objNull]], ["_oldKiller",objNull,[objNull]], ["_respawn",0,[0]], ["_respawnDelay",0,[0]]];
+TRACE_4("respawnTemplate",_newCorpse,_oldKiller,_respawn,_respawnDelay);
 
 // Compatibility handled via spectator display XEH
 if (_respawn in [0,1,4,5]) exitWith {

diff --git a/addons/spectator/functions/fnc_setSpectator.sqf b/addons/spectator/functions/fnc_setSpectator.sqf
@@ -101,6 +101,7 @@ if (_set) then {
 // Hide/Unhide the player if enabled and alive
 if (alive player) then {
     private _hidden = (_hide && _set);
+    TRACE_1("",_hidden);
 
     // Ignore damage (vanilla and ace_medical)
     player allowDamage !_hidden;

diff --git a/addons/spectator/functions/fnc_ui.sqf b/addons/spectator/functions/fnc_ui.sqf
@@ -17,6 +17,7 @@
 #include "script_component.hpp"
 
 params ["_init"];
+TRACE_1("ui",_init);
 
 // No change
 if (_init isEqualTo !isNull SPEC_DISPLAY) exitWith {};

diff --git a/addons/spectator/functions/fnc_ui_draw3D.sqf b/addons/spectator/functions/fnc_ui_draw3D.sqf
@@ -18,7 +18,7 @@
 #define HEIGHT_OFFSET 1.5
 
 BEGIN_COUNTER(updateCursor);
-private _camTarget = GVAR(camFocus);
+private _camTarget = missionNamespace getVariable [QGVAR(camFocus), objNull];
 private _camTargetVeh = vehicle _camTarget;
 private _cursorObject = objNull;