Cleanup more stuff

This commit is contained in:
PabstMirror 2015-09-18 14:24:20 -05:00
parent c62ea5e406
commit 5f0d73bab6
12 changed files with 6 additions and 44 deletions

View File

@ -17,8 +17,6 @@
params ["_projectile", "_adjustDir", "_adjustUp", ["_adjustSpeed",0]]; params ["_projectile", "_adjustDir", "_adjustUp", ["_adjustSpeed",0]];
//["CPD", [_fnc_scriptNameParent, _adjustDir, _adjustUp, _adjustSpeed], nil, false] call FUNC(log);
private ["_vdir", "_dir", "_up", "_vlat", "_vup", "_vel"]; private ["_vdir", "_dir", "_up", "_vlat", "_vup", "_vel"];
// get old direction vector // get old direction vector

View File

@ -44,8 +44,7 @@ if (_level <= _defaultLoglevel) then {
}; };
diag_log _message; diag_log _message;
// pass it onwards to the log function:
// [0, [], compile format["%1",_msg], true] call FUNC(log);
}; };
true true

View File

@ -81,4 +81,4 @@ switch (_priority) do {
default {}; default {};
}; };
["Anim", [_priority, _animation]] call FUNC(log); TRACE_2("Anim",_priority, _animation);

View File

@ -23,8 +23,6 @@ _function = call compile (_this select 1);
_unit = _this select 2; _unit = _this select 2;
_name = _this select 3; _name = _this select 3;
["Remote", [_arguments, _this select 1, _name], {format ["%1 call %2 id: %3", _this select 0, _this select 1, _this select 2]}, false] call FUNC(log);
// execute function on every currently connected machine // execute function on every currently connected machine
[[_arguments, _unit], _this select 1, 2] call FUNC(execRemoteFnc); [[_arguments, _unit], _this select 1, 2] call FUNC(execRemoteFnc);

View File

@ -29,8 +29,6 @@ if (isNil "_unit") then {
_unit = 2; _unit = 2;
}; };
["Remote", [_arguments, _this select 1, _unit], {format ["%1 call %2 to: %3", _this select 0, _this select 1, _this select 2]}, false] call FUNC(log);
if (typeName _unit == "SCALAR") exitWith { if (typeName _unit == "SCALAR") exitWith {
switch (_unit) do { switch (_unit) do {
case 0 : { case 0 : {

View File

@ -17,7 +17,7 @@
params ["_unit", "_vehicle", "_caller"]; params ["_unit", "_vehicle", "_caller"];
if (!alive _unit) then { if (!alive _unit) then {
_unit = [_unit, _caller] call FUNC(makeCopyOfBody); // _unit = [_unit, _caller] call FUNC(makeCopyOfBody); //func does not exist
}; };
private "_slotsOpen"; private "_slotsOpen";

View File

@ -17,9 +17,9 @@ _unit setvariable ["ACE_isUnconscious", nil, true];
if (isPlayer _unit) then { if (isPlayer _unit) then {
[true] call FUNC(setVolume); [true] call FUNC(setVolume);
[false] call FUNC(disableKeyInput); // [false] call FUNC(disableKeyInput); //func does not exist
if (["ace_medical"] call FUNC(isModLoaded)) then { if (["ace_medical"] call FUNC(isModLoaded)) then {
[false] call EFUNC(medical,effectBlackOut); // [false] call EFUNC(medical,effectBlackOut); //func does not exist
}; };
if !(isnil QGVAR(DISABLE_USER_INPUT_COLLECTION)) then { if !(isnil QGVAR(DISABLE_USER_INPUT_COLLECTION)) then {

View File

@ -87,8 +87,6 @@ if (_suitCoef == 0) then {_suitCoef = 0.001};
_gBlackOut = MAXVIRTUALG / _classCoef + MAXVIRTUALG / _suitCoef - MAXVIRTUALG; _gBlackOut = MAXVIRTUALG / _classCoef + MAXVIRTUALG / _suitCoef - MAXVIRTUALG;
_gRedOut = MINVIRTUALG / _classCoef; _gRedOut = MINVIRTUALG / _classCoef;
["GForces", [], {format ["_g _gBO _coef: %1, %2, %3", _average, _gBlackOut, 2 * ((1.0 - ((_average - 0.30 * _gBlackOut) / (0.70 * _gBlackOut)) ^ 2) max 0) ]}] call EFUNC(common,log);
// @todo: Sort the interaction with medical // @todo: Sort the interaction with medical
if ((_average > _gBlackOut) and {isClass (configFile >> "CfgPatches" >> "ACE_Medical") and {!(ACE_player getVariable ["ACE_isUnconscious", false])}}) then { if ((_average > _gBlackOut) and {isClass (configFile >> "CfgPatches" >> "ACE_Medical") and {!(ACE_player getVariable ["ACE_isUnconscious", false])}}) then {
[ACE_player, true, (10 + floor(random 5))] call EFUNC(medical,setUnconscious); [ACE_player, true, (10 + floor(random 5))] call EFUNC(medical,setUnconscious);

View File

@ -28,7 +28,7 @@ if (count _items == 0) exitwith {false};
_part = [_selectionName] call FUNC(selectionNameToNumber); _part = [_selectionName] call FUNC(selectionNameToNumber);
if (_part == 0 || _part == 1) exitwith { if (_part == 0 || _part == 1) exitwith {
// [_caller,"You cannot apply a CAT on this body part!"] call EFUNC(common,sendHintTo); // ["displayTextStructured", [_caller], ["You cannot apply a CAT on this body part!"]] call EFUNC(common,targetEvent);
false; false;
}; };

View File

@ -28,8 +28,6 @@ _barrelMass = 0.50 * (getNumber (configFile >> "CfgWeapons" >> _weapon >> "Weapo
// Calculate cooling // Calculate cooling
_temperature = [_temperature, _barrelMass, ACE_time - _time] call FUNC(cooldown); _temperature = [_temperature, _barrelMass, ACE_time - _time] call FUNC(cooldown);
//["Overheating", _temperature, {format ["Temperature: %1 °C", _this]}] call EFUNC(common,log);
// Store new temperature // Store new temperature
_time = ACE_time; _time = ACE_time;
_player setVariable [_string, [_temperature, _time], false]; _player setVariable [_string, [_temperature, _time], false];

View File

@ -165,8 +165,6 @@ if ("Jam" in (missionNamespace getvariable ["ACE_Debug", []])) then {
_jamChance = 0.5; _jamChance = 0.5;
}; };
["Overheating", [_temperature, _jamChance], {format ["Temperature: %1 - JamChance: %2", _this select 0, _this select 1]}] call EFUNC(common,log);
if (random 1 < _jamChance) then { if (random 1 < _jamChance) then {
[_unit, _weapon] call FUNC(jamWeapon); [_unit, _weapon] call FUNC(jamWeapon);
}; };

View File

@ -136,28 +136,3 @@ if (!hasInterface) exitWith {};
}, },
{false}, {false},
[201, [true, true, false]], true] call cba_fnc_addKeybind; [201, [true, true, false]], true] call cba_fnc_addKeybind;
// init shortdot
GVAR(showShortdot) = false;
["playerInventoryChanged", {
if (_this select 1 isEqualTo []) exitWith {}; //@todo fix eh
private "_showShortdot";
_showShortdot = _this select 1 select 9 select 2 == "ACE_optic_DMS";
if (GVAR(showShortdot)) then {
if (!_showShortdot) then {
// hide control and turn onDraw handler off
(uiNamespace getVariable ["ACE_ctrlShortdotReticle", controlNull]) ctrlShow false;
GVAR(showShortdot) = false;
};
} else {
if (_showShortdot) then {
// create control and turn onDraw handler on
([QGVAR(reticle)] call BIS_fnc_rscLayer) cutRsc ["ACE_Shortdot_Reticle", "PLAIN", 0, false];
(uiNamespace getVariable "ACE_ctrlShortdotReticle") ctrlSetText QUOTE(PATHTOF(data\reticles\ace_shortdot_reticle_1.paa));
GVAR(showShortdot) = true;
};
};
}] call EFUNC(common,addEventHandler);