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

fix CBA_fnc capitalization

Browse Source
This commit is contained in:
commy2 2015-11-30 16:45:20 +01:00
parent 3be60a2f6e
commit ca9b909e75
41 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
View File

@ -36,7 +36,7 @@ GVAR(Protractor) = true;
if !(GVAR(Protractor) && !(weaponLowered ACE_player) && currentWeapon ACE_player == primaryWeapon ACE_player) exitWith { if !(GVAR(Protractor) && !(weaponLowered ACE_player) && currentWeapon ACE_player == primaryWeapon ACE_player) exitWith {
GVAR(Protractor) = false; GVAR(Protractor) = false;
1 cutText ["", "PLAIN"]; 1 cutText ["", "PLAIN"];
[_idPFH] call cba_fnc_removePerFrameHandler; [_idPFH] call CBA_fnc_removePerFrameHandler;
}; };
1 cutRsc ["RscProtractor", "PLAIN", 1, false]; 1 cutRsc ["RscProtractor", "PLAIN", 1, false];

2
addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
View File

@ -40,7 +40,7 @@ GVAR(currentGrid) = 0;
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_FULL
systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(ACE_time - _initStartTime)]; systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(ACE_time - _initStartTime)];
#endif #endif
[_idPFH] call cba_fnc_removePerFrameHandler; [_idPFH] call CBA_fnc_removePerFrameHandler;
}; };
for "_i" from 1 to 50 do { for "_i" from 1 to 50 do {

2
addons/atragmx/functions/fnc_create_dialog.sqf
View File

@ -54,7 +54,7 @@ GVAR(active) = true;
GVAR(DialogPFH) = [{ GVAR(DialogPFH) = [{
if (!GVAR(active)) exitWith { if (!GVAR(active)) exitWith {
[_this select 1] call cba_fnc_removePerFrameHandler; [_this select 1] call CBA_fnc_removePerFrameHandler;
}; };
__ctrlBackground ctrlSetText format [QUOTE(PATHTOF(UI\ATRAG_%1.paa)), ["N", "D"] select (call EFUNC(common,ambientBrightness))]; __ctrlBackground ctrlSetText format [QUOTE(PATHTOF(UI\ATRAG_%1.paa)), ["N", "D"] select (call EFUNC(common,ambientBrightness))];
}, 60, []] call CBA_fnc_addPerFrameHandler; }, 60, []] call CBA_fnc_addPerFrameHandler;

2
addons/atragmx/functions/fnc_on_close_dialog.sqf
View File

@ -2,4 +2,4 @@
uiNamespace setVariable ['ATragMX_Display', nil]; uiNamespace setVariable ['ATragMX_Display', nil];
GVAR(active) = false; GVAR(active) = false;
[GVAR(DialogPFH)] call cba_fnc_removePerFrameHandler; [GVAR(DialogPFH)] call CBA_fnc_removePerFrameHandler;

2
addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
View File

@ -37,7 +37,7 @@ if !(ctrlVisible 9000) then {
false call FUNC(show_target_speed_assist_timer); false call FUNC(show_target_speed_assist_timer);
true call FUNC(show_target_speed_assist); true call FUNC(show_target_speed_assist);
[_this select 1] call cba_fnc_removePerFrameHandler; [_this select 1] call CBA_fnc_removePerFrameHandler;
}; };
ctrlSetText [9001, Str(Round((ACE_time - _startTime) * 10) / 10)]; ctrlSetText [9001, Str(Round((ACE_time - _startTime) * 10) / 10)];

2
addons/captives/functions/fnc_doEscortCaptive.sqf
View File

@ -45,7 +45,7 @@ if (_state) then {
}; };
if (!(_unit getVariable [QGVAR(isEscorting), false])) then { if (!(_unit getVariable [QGVAR(isEscorting), false])) then {
[(_this select 1)] call cba_fnc_removePerFrameHandler; [(_this select 1)] call CBA_fnc_removePerFrameHandler;
[objNull, _target, false] call EFUNC(common,claim); [objNull, _target, false] call EFUNC(common,claim);
detach _target; detach _target;
_unit removeAction _actionID; _unit removeAction _actionID;

4
addons/dagr/initKeybinds.sqf
View File

@ -14,7 +14,7 @@
true true
}, },
{false}, {false},
[0, [false, true, false]], false] call cba_fnc_addKeybind; // (empty default key) [0, [false, true, false]], false] call CBA_fnc_addKeybind; // (empty default key)
["ACE3 Equipment", QGVAR(ToggleKey), "Toggle DAGR", ["ACE3 Equipment", QGVAR(ToggleKey), "Toggle DAGR",
{ {
@ -27,7 +27,7 @@
true true
}, },
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; // (empty default key) [0, [false, false, false]], false] call CBA_fnc_addKeybind; // (empty default key)
//Add deviceKey entry: //Add deviceKey entry:
private ["_conditonCode", "_toggleCode", "_closeCode"]; private ["_conditonCode", "_toggleCode", "_closeCode"];

2
addons/disposable/functions/fnc_replaceATWeapon.sqf
View File

@ -52,7 +52,7 @@ if !([_unit] call EFUNC(common,isPlayer)) then {
//don't do anything until projectile is null (exploded/max range) //don't do anything until projectile is null (exploded/max range)
if (isNull _projectile) then { if (isNull _projectile) then {
//Remove PFEH: //Remove PFEH:
[_idPFH] call cba_fnc_removePerFrameHandler; [_idPFH] call CBA_fnc_removePerFrameHandler;
//If (tube is dropped) OR (is dead) OR (is player) just exit //If (tube is dropped) OR (is dead) OR (is player) just exit
if (((secondaryWeapon _unit) != _tube) || {!alive _unit} || {([_unit] call EFUNC(common,isPlayer))}) exitWith {}; if (((secondaryWeapon _unit) != _tube) || {!alive _unit} || {([_unit] call EFUNC(common,isPlayer))}) exitWith {};

2
addons/explosives/functions/fnc_dialingPhone.sqf
View File

@ -30,7 +30,7 @@ private "_explosive";
_explosive = [_code] call FUNC(getSpeedDialExplosive); _explosive = [_code] call FUNC(getSpeedDialExplosive);
if (_i >= (count _arr + 2)) then { if (_i >= (count _arr + 2)) then {
[_pfID] call CALLSTACK(cba_fnc_removePerFrameHandler); [_pfID] call CALLSTACK(CBA_fnc_removePerFrameHandler);
if ((count _explosive) > 0) then { if ((count _explosive) > 0) then {
[_unit, -1, [_explosive select 0, _explosive select 2]] call FUNC(detonateExplosive); [_unit, -1, [_explosive select 0, _explosive select 2]] call FUNC(detonateExplosive);
}; };

6
addons/fcs/initKeybinds.sqf
View File

@ -28,7 +28,7 @@
[vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyUp); [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyUp);
false false
}, },
[15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key [15, [false, false, false]], false] call CBA_fnc_addKeybind; //Tab Key
["ACE3 Vehicles", QGVAR(adjustRangeUp), localize LSTRING(AdjustRangeUp), ["ACE3 Vehicles", QGVAR(adjustRangeUp), localize LSTRING(AdjustRangeUp),
{ {
@ -42,7 +42,7 @@
true true
}, },
{false}, {false},
[201, [false, false, false]], false] call cba_fnc_addKeybind; //PageUp Key [201, [false, false, false]], false] call CBA_fnc_addKeybind; //PageUp Key
["ACE3 Vehicles", QGVAR(adjustRangDown), localize LSTRING(AdjustRangeDown), ["ACE3 Vehicles", QGVAR(adjustRangDown), localize LSTRING(AdjustRangeDown),
{ {
@ -56,4 +56,4 @@
true true
}, },
{false}, {false},
[209, [false, false, false]], false] call cba_fnc_addKeybind; //PageDown Key [209, [false, false, false]], false] call CBA_fnc_addKeybind; //PageDown Key

2
addons/finger/XEH_postInit.sqf
View File

@ -19,5 +19,5 @@ GVAR(pfeh_id) = -1;
_this call FUNC(keyPress); _this call FUNC(keyPress);
}, },
{false}, {false},
[41, [true, false, false]], true] call cba_fnc_addKeybind; // Shift + Tilda (hold) [41, [true, false, false]], true] call CBA_fnc_addKeybind; // Shift + Tilda (hold)
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);

10
addons/frag/functions/fnc_doExplosions.sqf
View File

@ -1,7 +1,7 @@
//fnc_doExplosions.sqf //fnc_doExplosions.sqf
#include "script_component.hpp" #include "script_component.hpp"
private ["_params", "_explosions", "_index", "_i", "_exp", "_refExp", "_bpos", "_hit", "_distance", "_indirectHitRange", "_depth"]; private ["_params", "_explosions", "_index", "_i", "_exp", "_refExp", "_bpos", "_hit", "_distance", "_indirectHitRange", "_depth"];
_params = _this select 0; _params = _this select 0;
_explosions = _params select 0; _explosions = _params select 0;
_index = _params select 1; _index = _params select 1;
@ -20,7 +20,7 @@ for "_i" from _index to ((_index+2) min (count _explosions)) do {
}; };
_index = _index + 2; _index = _index + 2;
if(_index >= (count _explosions)) then { if(_index >= (count _explosions)) then {
[(_this select 1)] call cba_fnc_removePerFrameHandler; [(_this select 1)] call CBA_fnc_removePerFrameHandler;
} else { } else {
_params set[1, _index]; _params set[1, _index];
}; };

8
addons/frag/functions/fnc_doReflections.sqf
View File

@ -1,7 +1,7 @@
//fnc_doReflections.sqf //fnc_doReflections.sqf
#include "script_component.hpp" #include "script_component.hpp"
private ["_pos", "_ammo", "_depth", "_hit", "_range", "_hitFactor", "_indirectHitRange", "_indirectHit", "_testParams"]; private ["_pos", "_ammo", "_depth", "_hit", "_range", "_hitFactor", "_indirectHitRange", "_indirectHit", "_testParams"];
_pos = _this select 0; _pos = _this select 0;
_ammo = _this select 1; _ammo = _this select 1;

24
addons/frag/functions/fnc_findReflections.sqf
View File

@ -1,6 +1,6 @@
//fnc_findReflections.sqf //fnc_findReflections.sqf
#include "script_component.hpp" #include "script_component.hpp"
private ["_split", "_radi", "_params", "_pos", "_explosiveInfo", "_los", "_nlos", "_zIndex", "_depth", "_indirectHitRange", "_indirectHit", "_distanceCount", "_lastPos", "_test", "_vec", "_testPos", "_buckets", "_excludes", "_bucketIndex", "_bucketPos", "_bucketList", "_c", "_index", "_blist", "_avgX", "_avgY", "_avgZ", "_bpos", "_distance", "_hitFactor", "_hit", "_range", "_refExp", "_rand", "_i", "_x", "_res", "_forEachIndex", "_explosions", "_can", "_dirvec", "_zAng"]; private ["_split", "_radi", "_params", "_pos", "_explosiveInfo", "_los", "_nlos", "_zIndex", "_depth", "_indirectHitRange", "_indirectHit", "_distanceCount", "_lastPos", "_test", "_vec", "_testPos", "_buckets", "_excludes", "_bucketIndex", "_bucketPos", "_bucketList", "_c", "_index", "_blist", "_avgX", "_avgY", "_avgZ", "_bpos", "_distance", "_hitFactor", "_hit", "_range", "_refExp", "_rand", "_i", "_x", "_res", "_forEachIndex", "_explosions", "_can", "_dirvec", "_zAng"];
_params = _this select 0; _params = _this select 0;
@ -21,15 +21,15 @@ _indirectHit = _explosiveInfo select 1;
_distanceCount = (floor _indirectHitRange*4) min 100; _distanceCount = (floor _indirectHitRange*4) min 100;
if(_zIndex < 5) then { if(_zIndex < 5) then {
_lastPos = _pos; _lastPos = _pos;
_zAng = _zIndex*20+2; _zAng = _zIndex*20+2;
if(_zAng > 80) then { if(_zAng > 80) then {
_radi = 1; _radi = 1;
_zAng = 90; _zAng = 90;
}; };
for "_i" from 0 to _radi do { for "_i" from 0 to _radi do {
_test = true; _test = true;
_vec = [1, ((_i*_split)+_rand) mod 360, _zAng] call cba_fnc_polar2vect; _vec = [1, ((_i*_split)+_rand) mod 360, _zAng] call CBA_fnc_polar2vect;
for "_x" from 1 to _distanceCount do { for "_x" from 1 to _distanceCount do {
_testPos = _pos vectorAdd (_vec vectorMultiply _x); _testPos = _pos vectorAdd (_vec vectorMultiply _x);
// drop ["\a3\data_f\Cl_basic","","Billboard",1,15,ASLtoATL _testPos,[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,1]],[0],0.0,2.0,"","",""]; // drop ["\a3\data_f\Cl_basic","","Billboard",1,15,ASLtoATL _testPos,[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,1]],[0],0.0,2.0,"","",""];
@ -43,7 +43,7 @@ if(_zIndex < 5) then {
// drop ["\a3\data_f\Cl_basic","","Billboard",1,15,ASLtoATL _testPos,[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,1]],[0],0.0,2.0,"","",""]; // drop ["\a3\data_f\Cl_basic","","Billboard",1,15,ASLtoATL _testPos,[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,1]],[0],0.0,2.0,"","",""];
// TEST_PAIRS pushBack [_pos, _lastPos, [1,0,0,1]]; // TEST_PAIRS pushBack [_pos, _lastPos, [1,0,0,1]];
}; };
// if(terrainIntersectASL [_pos, _testPos]) exitWith {}; // if(terrainIntersectASL [_pos, _testPos]) exitWith {};
_lastPos = _testPos; _lastPos = _testPos;
}; };
@ -106,7 +106,7 @@ if(_zIndex < 5) then {
_range = _range - (_range%2); _range = _range - (_range%2);
if(_hit >= 10 && _range > 0) then { if(_hit >= 10 && _range > 0) then {
// TEST_ICONS pushBack [_bpos, format["h: %1, r: %2, hf: %3 d: %4 ihr: %5", _hit, _range, _hitFactor, _distance, _indirectHitRange*4]]; // TEST_ICONS pushBack [_bpos, format["h: %1, r: %2, hf: %3 d: %4 ihr: %5", _hit, _range, _hitFactor, _distance, _indirectHitRange*4]];
// TEST_PAIRS pushBack [_pos, _bpos, [1,0,0,1]]; // TEST_PAIRS pushBack [_pos, _bpos, [1,0,0,1]];
_refExp = format["ace_explosion_reflection_%1_%2", _range, _hit]; _refExp = format["ace_explosion_reflection_%1_%2", _range, _hit];
// _refExp createVehicle (ASLtoATL _bpos); // _refExp createVehicle (ASLtoATL _bpos);
@ -122,5 +122,5 @@ if(_zIndex < 5) then {
// _dirvec = _dirvec vectorMultiply 100; // _dirvec = _dirvec vectorMultiply 100;
// _can setVelocity _dirvec; // _can setVelocity _dirvec;
[DFUNC(doExplosions), 0, [_explosions, 0]] call CBA_fnc_addPerFrameHandler; [DFUNC(doExplosions), 0, [_explosions, 0]] call CBA_fnc_addPerFrameHandler;
[(_this select 1)] call cba_fnc_removePerFrameHandler; [(_this select 1)] call CBA_fnc_removePerFrameHandler;
}; };

2
addons/frag/functions/fnc_stopTracing.sqf
View File

@ -1,5 +1,5 @@
#include "script_component.hpp" #include "script_component.hpp"
if(GVAR(tracesStarted)) then { if(GVAR(tracesStarted)) then {
GVAR(tracesStarted) = false; GVAR(tracesStarted) = false;
[GVAR(traceID)] call cba_fnc_removePerFrameHandler; [GVAR(traceID)] call CBA_fnc_removePerFrameHandler;
}; };

2
addons/frag/functions/fnc_trackTrace.sqf
View File

@ -10,5 +10,5 @@ if (alive _tracerObj && (count GVAR(traces)) > 0) then {
_positions = _data select 4; _positions = _data select 4;
_positions set [(count _positions), [(getPos _tracerObj), vectorMagnitude (velocity _tracerObj)]]; _positions set [(count _positions), [(getPos _tracerObj), vectorMagnitude (velocity _tracerObj)]];
} else { } else {
[(_this select 1)] call cba_fnc_removePerFrameHandler; [(_this select 1)] call CBA_fnc_removePerFrameHandler;
}; };

2
addons/huntir/functions/fnc_cam.sqf
View File

@ -93,7 +93,7 @@ GVAR(no_cams) sort true;
GVAR(pos) = getPosVisual GVAR(huntIR); GVAR(pos) = getPosVisual GVAR(huntIR);
if ((!dialog) || (count GVAR(no_cams) == 0) || ((GVAR(pos) select 2) <= 20)) exitWith { if ((!dialog) || (count GVAR(no_cams) == 0) || ((GVAR(pos) select 2) <= 20)) exitWith {
[_this select 1] call cba_fnc_removePerFrameHandler; [_this select 1] call CBA_fnc_removePerFrameHandler;
GVAR(stop) = true; GVAR(stop) = true;

2
addons/huntir/functions/fnc_huntir.sqf
View File

@ -48,7 +48,7 @@ createDialog "ace_huntir_cam_dialog_off";
_nearestHuntIRs = ACE_player nearEntities ["ACE_HuntIR", HUNTIR_MAX_TRANSMISSION_RANGE]; _nearestHuntIRs = ACE_player nearEntities ["ACE_HuntIR", HUNTIR_MAX_TRANSMISSION_RANGE];
if ((!dialog) || GVAR(done)) exitWith { if ((!dialog) || GVAR(done)) exitWith {
[_this select 1] call cba_fnc_removePerFrameHandler; [_this select 1] call CBA_fnc_removePerFrameHandler;
if (dialog && GVAR(state) == "connected") then { if (dialog && GVAR(state) == "connected") then {
[_nearestHuntIRs select 0] call FUNC(cam); [_nearestHuntIRs select 0] call FUNC(cam);

4
addons/interact_menu/XEH_clientInit.sqf
View File

@ -41,14 +41,14 @@ GVAR(ParsedTextCached) = [];
// Statement // Statement
[0] call FUNC(keyDown) [0] call FUNC(keyDown)
},{[0,false] call FUNC(keyUp)}, },{[0,false] call FUNC(keyUp)},
[219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key [219, [false, false, false]], false] call CBA_fnc_addKeybind; //Left Windows Key
["ACE3 Common", QGVAR(SelfInteractKey), (localize LSTRING(SelfInteractKey)), ["ACE3 Common", QGVAR(SelfInteractKey), (localize LSTRING(SelfInteractKey)),
{ {
// Statement // Statement
[1] call FUNC(keyDown) [1] call FUNC(keyDown)
},{[1,false] call FUNC(keyUp)}, },{[1,false] call FUNC(keyUp)},
[219, [false, true, false]], false] call cba_fnc_addKeybind; //Left Windows Key + Ctrl/Strg [219, [false, true, false]], false] call CBA_fnc_addKeybind; //Left Windows Key + Ctrl/Strg
// Listens for the falling unconscious event, just in case the menu needs to be closed // Listens for the falling unconscious event, just in case the menu needs to be closed

2
addons/javelin/functions/fnc_onOpticDraw.sqf
View File

@ -55,7 +55,7 @@ if (((count _weaponConfig) < 1) || {(getNumber (_weaponConfig select 0)) != 1})
_fireDisabledEH = [_fireDisabledEH] call FUNC(enableFire); _fireDisabledEH = [_fireDisabledEH] call FUNC(enableFire);
}; };
[(_this select 1)] call cba_fnc_removePerFrameHandler; [(_this select 1)] call CBA_fnc_removePerFrameHandler;
GVAR(pfehID) = -1; GVAR(pfehID) = -1;
}; };

4
addons/javelin/initKeybinds.sqf
View File

@ -19,7 +19,7 @@
[ACE_player] call FUNC(lockKeyUp); [ACE_player] call FUNC(lockKeyUp);
false false
}, },
[15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key [15, [false, false, false]], false] call CBA_fnc_addKeybind; //Tab Key
["ACE3 Weapons", QGVAR(cycleFireMode), localize LSTRING(CycleFireMode), ["ACE3 Weapons", QGVAR(cycleFireMode), localize LSTRING(CycleFireMode),
{ false }, { false },
@ -27,4 +27,4 @@
[ACE_player] call FUNC(cycleFireMode); [ACE_player] call FUNC(cycleFireMode);
false false
}, },
[15, [false, true, false]], false] call cba_fnc_addKeybind; //Ctrl+Tab Key [15, [false, true, false]], false] call CBA_fnc_addKeybind; //Ctrl+Tab Key

2
addons/laser/functions/fnc_laserTargetPFH.sqf
View File

@ -10,7 +10,7 @@ _shooter = _args select 1;
_uuid = _args select 2; _uuid = _args select 2;
if(isNull _laserTarget || !alive _shooter) exitWith { if(isNull _laserTarget || !alive _shooter) exitWith {
[(_this select 1)] call cba_fnc_removePerFrameHandler; [(_this select 1)] call CBA_fnc_removePerFrameHandler;
REM(GVAR(VanillaLasers), _laserTarget); REM(GVAR(VanillaLasers), _laserTarget);
// Remove laseron // Remove laseron

2
addons/missileguidance/functions/fnc_guidancePFH.sqf
View File

@ -13,7 +13,7 @@ _args = _this select 0;
EXPLODE_7_PVT((_args select 0),_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile); EXPLODE_7_PVT((_args select 0),_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
if(!alive _projectile || isNull _projectile || isNull _shooter) exitWith { if(!alive _projectile || isNull _projectile || isNull _shooter) exitWith {
[(_this select 1)] call cba_fnc_removePerFrameHandler; [(_this select 1)] call CBA_fnc_removePerFrameHandler;
}; };
_launchParams = _args select 1; _launchParams = _args select 1;

2
addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
View File

@ -71,7 +71,7 @@ if (_activated && local _logic) then {
_args params ["_logic", "_ambianceSounds", "_minimalDistance", "_maximalDistance", "_minDelayBetweensounds", "_maxDelayBetweenSounds", "_volume", "_followPlayers", "_lastTimePlayed"]; _args params ["_logic", "_ambianceSounds", "_minimalDistance", "_maximalDistance", "_minDelayBetweensounds", "_maxDelayBetweenSounds", "_volume", "_followPlayers", "_lastTimePlayed"];
if (!alive _logic) exitWith { if (!alive _logic) exitWith {
[_pfhHandle] call cba_fnc_removePerFrameHandler; [_pfhHandle] call CBA_fnc_removePerFrameHandler;
}; };
if (ACE_time - _lastTimePlayed >= ((_minDelayBetweensounds + random(_maxDelayBetweenSounds)) min _maxDelayBetweenSounds)) then { if (ACE_time - _lastTimePlayed >= ((_minDelayBetweensounds + random(_maxDelayBetweenSounds)) min _maxDelayBetweenSounds)) then {

2
addons/mk6mortar/functions/fnc_handleFired.sqf
View File

@ -60,7 +60,7 @@ if (_newMuzzleVelocityCoefficent != 1) then {
EXPLODE_4_PVT(_args,_shell,_airFriction,_time,_relativeDensity); EXPLODE_4_PVT(_args,_shell,_airFriction,_time,_relativeDensity);
if (isNull _shell || {!alive _shell}) exitwith { if (isNull _shell || {!alive _shell}) exitwith {
[_pfID] call cba_fnc_removePerFrameHandler; [_pfID] call CBA_fnc_removePerFrameHandler;
}; };
_deltaT = ACE_time - _time; _deltaT = ACE_time - _time;

2
addons/movement/XEH_postInit.sqf
View File

@ -32,4 +32,4 @@ if (!hasInterface) exitWith {};
true true
}, },
{false}, {false},
[47, [false, true, false]], false] call cba_fnc_addKeybind; //DIK_V + CTRL//STRG [47, [false, true, false]], false] call CBA_fnc_addKeybind; //DIK_V + CTRL//STRG

2
addons/nametags/XEH_postInit.sqf
View File

@ -20,7 +20,7 @@ GVAR(showNamesTime) = -10;
false false
}, },
{false}, {false},
[29, [false, false, false]], false] call cba_fnc_addKeybind; //LeftControl Key [29, [false, false, false]], false] call CBA_fnc_addKeybind; //LeftControl Key
// Monitor the assigned teams, and propegate them appropriately for the player // Monitor the assigned teams, and propegate them appropriately for the player
// This allows for assigned team colors to match across the entire group // This allows for assigned team colors to match across the entire group

4
addons/nightvision/XEH_postInitClient.sqf
View File

@ -49,7 +49,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
true true
}, },
{false}, {false},
[201, [false, false, true]], false] call cba_fnc_addKeybind; //PageUp + ALT [201, [false, false, true]], false] call CBA_fnc_addKeybind; //PageUp + ALT
["ACE3 Equipment", QGVAR(DecreaseNVGBrightness), localize LSTRING(DecreaseNVGBrightness), ["ACE3 Equipment", QGVAR(DecreaseNVGBrightness), localize LSTRING(DecreaseNVGBrightness),
{ {
@ -63,4 +63,4 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
true true
}, },
{false}, {false},
[209, [false, false, true]], false] call cba_fnc_addKeybind; //PageDown + ALT [209, [false, false, true]], false] call CBA_fnc_addKeybind; //PageDown + ALT

2
addons/overheating/XEH_postInit.sqf
View File

@ -18,4 +18,4 @@ if (!hasInterface) exitWith {};
true true
}, },
{false}, {false},
[19, [true, false, false]], false] call cba_fnc_addKeybind; //R Key [19, [true, false, false]], false] call CBA_fnc_addKeybind; //R Key

2
addons/overheating/functions/fnc_jamWeapon.sqf
View File

@ -34,7 +34,7 @@ _fnc_stopCurrentBurst = {
if (diag_frameno == _startFrame) exitWith {}; if (diag_frameno == _startFrame) exitWith {};
// Remove the PFH on the second execution // Remove the PFH on the second execution
[_pfhId] call cba_fnc_removePerFrameHandler; [_pfhId] call CBA_fnc_removePerFrameHandler;
_unit setAmmo [_weapon, _ammo]; _unit setAmmo [_weapon, _ammo];
}; };

2
addons/parachute/XEH_postInit.sqf
View File

@ -30,7 +30,7 @@ if (!hasInterface) exitWith {};
true true
}, },
{false}, {false},
[24, [false, false, false]], false] call cba_fnc_addKeybind; [24, [false, false, false]], false] call CBA_fnc_addKeybind;
GVAR(PFH) = false; GVAR(PFH) = false;
["playerVehicleChanged",{ ["playerVehicleChanged",{

2
addons/parachute/functions/fnc_doLanding.sqf
View File

@ -22,6 +22,6 @@ _unit setVariable [QGVAR(chuteIsCut), false, true];
[{ [{
if (ACE_time >= ((_this select 0) select 0) + 1) then { if (ACE_time >= ((_this select 0) select 0) + 1) then {
((_this select 0) select 1) playActionNow "Crouch"; ((_this select 0) select 1) playActionNow "Crouch";
[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler); [(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);
}; };
}, 1, [ACE_time,_unit]] call CALLSTACK(CBA_fnc_addPerFrameHandler); }, 1, [ACE_time,_unit]] call CALLSTACK(CBA_fnc_addPerFrameHandler);

10
addons/parachute/functions/fnc_onEachFrame.sqf
View File

@ -16,16 +16,16 @@
#include "script_component.hpp" #include "script_component.hpp"
private "_player"; private "_player";
_player = ACE_player; _player = ACE_player;
if (!GVAR(PFH)) exitWith {[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);}; if (!GVAR(PFH)) exitWith {[(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);};
if (isNull _player) exitWith {[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);GVAR(PFH) = false;}; if (isNull _player) exitWith {[(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);GVAR(PFH) = false;};
if !((vehicle _player) isKindOf "ParachuteBase") exitWith {[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);GVAR(PFH) = false;}; if !((vehicle _player) isKindOf "ParachuteBase") exitWith {[(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);GVAR(PFH) = false;};
if (isTouchingGround _player) exitWith {[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);GVAR(PFH) = false;}; if (isTouchingGround _player) exitWith {[(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);GVAR(PFH) = false;};
private ["_pos"]; private ["_pos"];
_pos = getPosASL (vehicle _player); _pos = getPosASL (vehicle _player);
if ((lineIntersects [_pos, _pos vectorAdd [0,0,-0.5], vehicle _player, _player]) || {((ASLtoATL _pos) select 2) < 0.75}) then { if ((lineIntersects [_pos, _pos vectorAdd [0,0,-0.5], vehicle _player, _player]) || {((ASLtoATL _pos) select 2) < 0.75}) then {
[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler); [(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);
GVAR(PFH) = false; GVAR(PFH) = false;
// I believe this will not work for Zeus units. // I believe this will not work for Zeus units.
deleteVehicle (vehicle _player); deleteVehicle (vehicle _player);

4
addons/parachute/functions/fnc_showAltimeter.sqf
View File

@ -23,10 +23,10 @@ if (isNull (uiNamespace getVariable ["ACE_Altimeter", displayNull])) exitWith {}
GVAR(AltimeterActive) = true; GVAR(AltimeterActive) = true;
[{ [{
if (!GVAR(AltimeterActive)) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler)}; if (!GVAR(AltimeterActive)) exitWith {[_this select 1] call CALLSTACK(CBA_fnc_removePerFrameEventHandler)};
disableSerialization; disableSerialization;
(_this select 0) params ["_display", "_unit", "_oldHeight", "_prevTime"]; (_this select 0) params ["_display", "_unit", "_oldHeight", "_prevTime"];
if !("ACE_Altimeter" in assignedItems _unit) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler); call FUNC(hideAltimeter)}; if !("ACE_Altimeter" in assignedItems _unit) exitWith {[_this select 1] call CALLSTACK(CBA_fnc_removePerFrameEventHandler); call FUNC(hideAltimeter)};
private ["_height", "_hour", "_minute", "_descentRate","_HeightText", "_DecendRate", "_TimeText", "_curTime", "_timeDiff"]; private ["_height", "_hour", "_minute", "_descentRate","_HeightText", "_DecendRate", "_TimeText", "_curTime", "_timeDiff"];

2
addons/reload/XEH_postInit.sqf
View File

@ -16,7 +16,7 @@ if (!hasInterface) exitWith {};
true true
}, },
{false}, {false},
[19, [false, true, false]], false] call cba_fnc_addKeybind; [19, [false, true, false]], false] call CBA_fnc_addKeybind;
["setAmmoSync", { ["setAmmoSync", {
//To propagate the setAmmo change, do it on all clients //To propagate the setAmmo change, do it on all clients

18
addons/scopes/XEH_postInit.sqf
View File

@ -25,7 +25,7 @@ if (!hasInterface) exitWith {};
if !(isNil QGVAR(fadePFH)) then { if !(isNil QGVAR(fadePFH)) then {
[GVAR(fadePFH)] call cba_fnc_removePerFrameHandler; [GVAR(fadePFH)] call CBA_fnc_removePerFrameHandler;
GVAR(fadePFH) = nil; GVAR(fadePFH) = nil;
}; };
}; };
@ -44,7 +44,7 @@ if (!hasInterface) exitWith {};
[ACE_player, ELEVATION_UP, MINOR_INCREMENT] call FUNC(adjustScope); [ACE_player, ELEVATION_UP, MINOR_INCREMENT] call FUNC(adjustScope);
}, },
{false}, {false},
[201, [false, false, false]], true] call cba_fnc_addKeybind; [201, [false, false, false]], true] call CBA_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustDownMinor), localize LSTRING(AdjustDownMinor), ["ACE3 Scope Adjustment", QGVAR(AdjustDownMinor), localize LSTRING(AdjustDownMinor),
{ {
@ -57,7 +57,7 @@ if (!hasInterface) exitWith {};
[ACE_player, ELEVATION_DOWN, MINOR_INCREMENT] call FUNC(adjustScope); [ACE_player, ELEVATION_DOWN, MINOR_INCREMENT] call FUNC(adjustScope);
}, },
{false}, {false},
[209, [false, false, false]], true] call cba_fnc_addKeybind; [209, [false, false, false]], true] call CBA_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustLeftMinor), localize LSTRING(AdjustLeftMinor), ["ACE3 Scope Adjustment", QGVAR(AdjustLeftMinor), localize LSTRING(AdjustLeftMinor),
{ {
@ -70,7 +70,7 @@ if (!hasInterface) exitWith {};
[ACE_player, WINDAGE_LEFT, MINOR_INCREMENT] call FUNC(adjustScope); [ACE_player, WINDAGE_LEFT, MINOR_INCREMENT] call FUNC(adjustScope);
}, },
{false}, {false},
[209, [false, true, false]], true] call cba_fnc_addKeybind; [209, [false, true, false]], true] call CBA_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustRightMinor), localize LSTRING(AdjustRightMinor), ["ACE3 Scope Adjustment", QGVAR(AdjustRightMinor), localize LSTRING(AdjustRightMinor),
{ {
@ -83,7 +83,7 @@ if (!hasInterface) exitWith {};
[ACE_player, WINDAGE_RIGHT, MINOR_INCREMENT] call FUNC(adjustScope); [ACE_player, WINDAGE_RIGHT, MINOR_INCREMENT] call FUNC(adjustScope);
}, },
{false}, {false},
[201, [false, true, false]], true] call cba_fnc_addKeybind; [201, [false, true, false]], true] call CBA_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustUpMajor), localize LSTRING(AdjustUpMajor), ["ACE3 Scope Adjustment", QGVAR(AdjustUpMajor), localize LSTRING(AdjustUpMajor),
{ {
@ -96,7 +96,7 @@ if (!hasInterface) exitWith {};
[ACE_player, ELEVATION_UP, MAJOR_INCREMENT] call FUNC(adjustScope); [ACE_player, ELEVATION_UP, MAJOR_INCREMENT] call FUNC(adjustScope);
}, },
{false}, {false},
[201, [true, false, false]], true] call cba_fnc_addKeybind; [201, [true, false, false]], true] call CBA_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustDownMajor), localize LSTRING(AdjustDownMajor), ["ACE3 Scope Adjustment", QGVAR(AdjustDownMajor), localize LSTRING(AdjustDownMajor),
{ {
@ -109,7 +109,7 @@ if (!hasInterface) exitWith {};
[ACE_player, ELEVATION_DOWN, MAJOR_INCREMENT] call FUNC(adjustScope); [ACE_player, ELEVATION_DOWN, MAJOR_INCREMENT] call FUNC(adjustScope);
}, },
{false}, {false},
[209, [true, false, false]], true] call cba_fnc_addKeybind; [209, [true, false, false]], true] call CBA_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustLeftMajor), localize LSTRING(AdjustLeftMajor), ["ACE3 Scope Adjustment", QGVAR(AdjustLeftMajor), localize LSTRING(AdjustLeftMajor),
{ {
@ -122,7 +122,7 @@ if (!hasInterface) exitWith {};
[ACE_player, WINDAGE_LEFT, MAJOR_INCREMENT] call FUNC(adjustScope); [ACE_player, WINDAGE_LEFT, MAJOR_INCREMENT] call FUNC(adjustScope);
}, },
{false}, {false},
[209, [true, true, false]], true] call cba_fnc_addKeybind; [209, [true, true, false]], true] call CBA_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustRightMajor), localize LSTRING(AdjustRightMajor), ["ACE3 Scope Adjustment", QGVAR(AdjustRightMajor), localize LSTRING(AdjustRightMajor),
{ {
@ -135,4 +135,4 @@ if (!hasInterface) exitWith {};
[ACE_player, WINDAGE_RIGHT, MAJOR_INCREMENT] call FUNC(adjustScope); [ACE_player, WINDAGE_RIGHT, MAJOR_INCREMENT] call FUNC(adjustScope);
}, },
{false}, {false},
[201, [true, true, false]], true] call cba_fnc_addKeybind; [201, [true, true, false]], true] call CBA_fnc_addKeybind;

2
addons/scopes/functions/fnc_showZeroing.sqf
View File

@ -58,6 +58,6 @@ GVAR(fadePFH) = [{
_layer cutFadeOut 2; _layer cutFadeOut 2;
GVAR(fadePFH) = nil; GVAR(fadePFH) = nil;
[_pfhId] call cba_fnc_removePerFrameHandler; [_pfhId] call CBA_fnc_removePerFrameHandler;
}; };
}, 0.1, []] call CBA_fnc_addPerFrameHandler }, 0.1, []] call CBA_fnc_addPerFrameHandler

2
addons/switchunits/functions/fnc_switchBack.sqf
View File

@ -32,6 +32,6 @@ params ["_originalPlayerUnit"];
_layer = "BIS_fnc_respawnCounter" call bis_fnc_rscLayer; _layer = "BIS_fnc_respawnCounter" call bis_fnc_rscLayer;
_layer cuttext ["","plain"]; _layer cuttext ["","plain"];
[_pfhId] call cba_fnc_removePerFrameHandler; [_pfhId] call CBA_fnc_removePerFrameHandler;
}; };
}, 0.2, _this] call CBA_fnc_addPerFrameHandler; }, 0.2, _this] call CBA_fnc_addPerFrameHandler;

2
addons/switchunits/functions/fnc_switchUnit.sqf
View File

@ -76,6 +76,6 @@ if (_leave) exitWith {
[localize LSTRING(SwitchedUnit)] call EFUNC(common,displayTextStructured); [localize LSTRING(SwitchedUnit)] call EFUNC(common,displayTextStructured);
[_pfhId] call cba_fnc_removePerFrameHandler; [_pfhId] call CBA_fnc_removePerFrameHandler;
}; };
}, 0.2, [_unit, player]] call CBA_fnc_addPerFrameHandler; }, 0.2, [_unit, player]] call CBA_fnc_addPerFrameHandler;

2
addons/vehicles/XEH_postInit.sqf
View File

@ -18,4 +18,4 @@ if (!hasInterface) exitWith {};
true true
}, },
{false}, {false},
[211, [false, false, false]], false] call cba_fnc_addKeybind; //DELETE Key [211, [false, false, false]], false] call CBA_fnc_addKeybind; //DELETE Key

2
addons/weather/functions/fnc_displayWindInfo.sqf
View File

@ -33,7 +33,7 @@ GVAR(WindInfo) = true;
if !(GVAR(WindInfo) && !(underwater ACE_player) && vehicle ACE_player == ACE_player) exitWith { if !(GVAR(WindInfo) && !(underwater ACE_player) && vehicle ACE_player == ACE_player) exitWith {
GVAR(WindInfo) = false; GVAR(WindInfo) = false;
0 cutText ["", "PLAIN"]; 0 cutText ["", "PLAIN"];
[_this select 1] call cba_fnc_removePerFrameHandler; [_this select 1] call CBA_fnc_removePerFrameHandler;
}; };
_windIndex = 12; _windIndex = 12;