Skip to content

Commit

Permalink
Core - Cleanup debug (#1002)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonpas committed Aug 11, 2020
1 parent 68e3c4d commit 5537e54
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions addons/sys_core/fnc_processRadioSpeaker.sqf
Expand Up @@ -28,11 +28,9 @@ TRACE_2("",_unit,_playerRadios);
private _radioId = _unit getVariable [QGVAR(currentSpeakingRadio), ""];
if (_radioId == "") exitWith { false };

// Debug #638
if (isNil "_radioId") exitWith {
WARNING_1("reserved variable debug 1 - report on GitHub! [%1]",_radioId);
false
};
// Workaround #638 - _radioId is nil - TODO investigate further
// Probable source: https://github.com/IDI-Systems/acre2/blob/c03262be2190cd54c3cb5f27d7ca3eddf7270506/addons/sys_core/fnc_remoteStartSpeaking.sqf#L107
if (isNil "_radioId") exitWith { false };

// @todo if Underwater Radios are implemented
//if (ACRE_LISTENER_DIVE == 1) exitWith { false };
Expand All @@ -50,12 +48,6 @@ if (!GVAR(speaking_cache_valid)) then {
#endif
_okRadios = (_okRadios select 0) select 1;

// Debug #638
if (isNil "_radioId") exitWith {
WARNING_3("reserved variable debug 2 - report on GitHub! [%1-%2-%3]",_radioId,_okRadios,_playerRadios);
false
};

private _transmittingRadioData = [_radioId, "getCurrentChannelData"] call EFUNC(sys_data,dataEvent);
private _mode = HASH_GET(_transmittingRadioData, "mode");
_functionName = getText(configFile >> "CfgAcreRadioModes" >> _mode >> "speaking");
Expand Down

0 comments on commit 5537e54

Please sign in to comment.