Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Spectator - Fix script error in ui_draw3d #5722

Merged
merged 1 commit into from Nov 4, 2017
Merged

Spectator - Fix script error in ui_draw3d #5722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/spectator/functions/fnc_cam.sqf
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@
#include "script_component.hpp"

params ["_init"];
TRACE_1("cam",_init);

// No change
if (_init isEqualTo !isNil QGVAR(camera)) exitWith {};
Expand Down
1 change: 1 addition & 0 deletions addons/spectator/functions/fnc_respawnTemplate.sqf
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions addons/spectator/functions/fnc_setSpectator.sqf
View file
Open in desktop
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions addons/spectator/functions/fnc_ui.sqf
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@
#include "script_component.hpp"

params ["_init"];
TRACE_1("ui",_init);

// No change
if (_init isEqualTo !isNull SPEC_DISPLAY) exitWith {};
Expand Down
2 changes: 1 addition & 1 deletion addons/spectator/functions/fnc_ui_draw3D.sqf
View file
Open in desktop
Expand Up @@ -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;

Expand Down