Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Spectator - Fix script error in ui_draw3d (#5722)

Browse Source
This commit is contained in:
PabstMirror 2017-11-04 11:03:51 -05:00 committed by GitHub
parent 96d978615e
commit c20ec6599d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/spectator/functions/fnc_cam.sqf
View File

@ -17,6 +17,7 @@
#include "script_component.hpp" #include "script_component.hpp"
params ["_init"]; params ["_init"];
TRACE_1("cam",_init);
// No change // No change
if (_init isEqualTo !isNil QGVAR(camera)) exitWith {}; if (_init isEqualTo !isNil QGVAR(camera)) exitWith {};

1
addons/spectator/functions/fnc_respawnTemplate.sqf
View File

@ -23,6 +23,7 @@
#include "script_component.hpp" #include "script_component.hpp"
params [["_newCorpse",objNull,[objNull]], ["_oldKiller",objNull,[objNull]], ["_respawn",0,[0]], ["_respawnDelay",0,[0]]]; 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 // Compatibility handled via spectator display XEH
if (_respawn in [0,1,4,5]) exitWith { if (_respawn in [0,1,4,5]) exitWith {

1
addons/spectator/functions/fnc_setSpectator.sqf
View File

@ -101,6 +101,7 @@ if (_set) then {
// Hide/Unhide the player if enabled and alive // Hide/Unhide the player if enabled and alive
if (alive player) then { if (alive player) then {
private _hidden = (_hide && _set); private _hidden = (_hide && _set);
TRACE_1("",_hidden);
// Ignore damage (vanilla and ace_medical) // Ignore damage (vanilla and ace_medical)
player allowDamage !_hidden; player allowDamage !_hidden;

1
addons/spectator/functions/fnc_ui.sqf
View File

@ -17,6 +17,7 @@
#include "script_component.hpp" #include "script_component.hpp"
params ["_init"]; params ["_init"];
TRACE_1("ui",_init);
// No change // No change
if (_init isEqualTo !isNull SPEC_DISPLAY) exitWith {}; if (_init isEqualTo !isNull SPEC_DISPLAY) exitWith {};

2
addons/spectator/functions/fnc_ui_draw3D.sqf
View File

@ -18,7 +18,7 @@
#define HEIGHT_OFFSET 1.5 #define HEIGHT_OFFSET 1.5
BEGIN_COUNTER(updateCursor); BEGIN_COUNTER(updateCursor);
private _camTarget = GVAR(camFocus); private _camTarget = missionNamespace getVariable [QGVAR(camFocus), objNull];
private _camTargetVeh = vehicle _camTarget; private _camTargetVeh = vehicle _camTarget;
private _cursorObject = objNull; private _cursorObject = objNull;