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

Removed a newlines for code brackets in arrays

Browse Source
This commit is contained in:
lambdatiger 2024-08-27 22:14:42 -05:00
parent dae81be848
commit 70606d411c
6 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/frag/XEH_postInit.sqf
View File

@ -1,8 +1,7 @@
#include "script_component.hpp" #include "script_component.hpp"
[ [
"CBA_settingsInitialized", "CBA_settingsInitialized", {
{
["ace_firedPlayer", LINKFUNC(fired)] call CBA_fnc_addEventHandler; ["ace_firedPlayer", LINKFUNC(fired)] call CBA_fnc_addEventHandler;
["ace_firedNonPlayer", LINKFUNC(fired)] call CBA_fnc_addEventHandler; ["ace_firedNonPlayer", LINKFUNC(fired)] call CBA_fnc_addEventHandler;
["ace_firedPlayerVehicle", LINKFUNC(fired)] call CBA_fnc_addEventHandler; ["ace_firedPlayerVehicle", LINKFUNC(fired)] call CBA_fnc_addEventHandler;
@ -15,17 +14,14 @@
["ace_firedPlayerNonLocal", LINKFUNC(dev_fired)] call CBA_fnc_addEventHandler; ["ace_firedPlayerNonLocal", LINKFUNC(dev_fired)] call CBA_fnc_addEventHandler;
GVAR(dev_drawPFEH) = [LINKFUNC(dev_drawTrace), 0] call CBA_fnc_addPerFrameHandler; GVAR(dev_drawPFEH) = [LINKFUNC(dev_drawTrace), 0] call CBA_fnc_addPerFrameHandler;
[ [
"ace_interact_menu_newControllableObject", "ace_interact_menu_newControllableObject", {
{
params ["_type"]; params ["_type"];
private _action = [ private _action = [
QGVAR(debugReset), QGVAR(debugReset),
"Reset ACE Frag traces", "Reset ACE Frag traces",
"", "",
{ {[QGVAR(dev_clearTraces), []] call CBA_fnc_globalEvent;},
[QGVAR(dev_clearTraces), []] call CBA_fnc_globalEvent;
},
{GVAR(dev_trackLines) isNotEqualTo createHashMap} {GVAR(dev_trackLines) isNotEqualTo createHashMap}
] call EFUNC(interact_menu,createAction); ] call EFUNC(interact_menu,createAction);
[ [

9
addons/frag/functions/fnc_dev_addRound.sqf
View File

@ -57,8 +57,7 @@ if (_isTraceBlue) then {
if (!_addProjectileEventHandlers) exitWith {}; if (!_addProjectileEventHandlers) exitWith {};
_projectile addEventHandler [ _projectile addEventHandler [
"HitPart", "HitPart", {
{
params ["_projectile", "", "", "_posASL"]; params ["_projectile", "", "", "_posASL"];
private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0; private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0;
_posArr pushBack ASLToATL _posASL; _posArr pushBack ASLToATL _posASL;
@ -69,8 +68,7 @@ _projectile addEventHandler [
]; ];
_projectile addEventHandler [ _projectile addEventHandler [
"Explode", "Explode", {
{
params ["_projectile", "_posASL"]; params ["_projectile", "_posASL"];
private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0; private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0;
_posArr pushBack ASLToATL _posASL; _posArr pushBack ASLToATL _posASL;
@ -81,8 +79,7 @@ _projectile addEventHandler [
]; ];
_projectile addEventHandler [ _projectile addEventHandler [
"Deflected", "Deflected", {
{
params ["_projectile", "_posASL"]; params ["_projectile", "_posASL"];
private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0; private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0;
_posArr pushBack ASLToATL _posASL; _posArr pushBack ASLToATL _posASL;

9
addons/frag/functions/fnc_dev_trackObj.sqf
View File

@ -64,8 +64,7 @@ GVAR(dev_trackLines) set [getObjectID _object, [[getPosATL _object], _colorArray
if (!_isProj) exitWith {}; if (!_isProj) exitWith {};
_object addEventHandler [ _object addEventHandler [
"HitPart", "HitPart", {
{
params ["_projectile", "", "", "_posASL"]; params ["_projectile", "", "", "_posASL"];
private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0; private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0;
_posArr pushBack ASLToATL _posASL; _posArr pushBack ASLToATL _posASL;
@ -76,8 +75,7 @@ _object addEventHandler [
]; ];
_object addEventHandler [ _object addEventHandler [
"Explode", "Explode", {
{
params ["_projectile", "_posASL"]; params ["_projectile", "_posASL"];
private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0; private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0;
_posArr pushBack ASLToATL _posASL; _posArr pushBack ASLToATL _posASL;
@ -88,8 +86,7 @@ _object addEventHandler [
]; ];
_object addEventHandler [ _object addEventHandler [
"Deflected", "Deflected", {
{
params ["_projectile", "_posASL"]; params ["_projectile", "_posASL"];
private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0; private _posArr = (GVAR(dev_trackLines) get (getObjectID _projectile))#0;
_posArr pushBack ASLToATL _posASL; _posArr pushBack ASLToATL _posASL;

6
addons/frag/functions/fnc_fired.sqf
View File

@ -27,8 +27,7 @@ if (_ammo isEqualTo "" || {isNull _projectile} ||
if (GVAR(spallEnabled) && {_ammo call FUNC(shouldSpall)}) then { if (GVAR(spallEnabled) && {_ammo call FUNC(shouldSpall)}) then {
private _hitPartEventHandler = _projectile addEventHandler [ private _hitPartEventHandler = _projectile addEventHandler [
"HitPart", "HitPart", {
{
params ["_projectile", "_hitObject", "", "_posASL", "_velocity"]; params ["_projectile", "_hitObject", "", "_posASL", "_velocity"];
// starting v2.18 it may be faster to use the instigator EH parameter, the same as the second entry shotParents, to recreate _shotParent // starting v2.18 it may be faster to use the instigator EH parameter, the same as the second entry shotParents, to recreate _shotParent
@ -56,8 +55,7 @@ if (GVAR(spallEnabled) && {_ammo call FUNC(shouldSpall)}) then {
if (GVAR(reflectionsEnabled) || (GVAR(enabled) && {_ammo call FUNC(shouldFrag)})) then { if (GVAR(reflectionsEnabled) || (GVAR(enabled) && {_ammo call FUNC(shouldFrag)})) then {
private _explodeEventHandler = _projectile addEventHandler [ private _explodeEventHandler = _projectile addEventHandler [
"Explode", "Explode", {
{
params ["_projectile", "_posASL"]; params ["_projectile", "_posASL"];
private _ammo = typeOf _projectile; private _ammo = typeOf _projectile;

3
addons/frag/functions/fnc_getSpallInfo.sqf
View File

@ -21,8 +21,7 @@
params ["_ammo"]; params ["_ammo"];
GVAR(spallInfoCache) getOrDefaultCall [ GVAR(spallInfoCache) getOrDefaultCall [
_ammo, _ammo, {
{
private _ammoConfig = configFile >> "CfgAmmo" >> _ammo; private _ammoConfig = configFile >> "CfgAmmo" >> _ammo;
private _caliber = getNumber (_ammoConfig >> "caliber"); private _caliber = getNumber (_ammoConfig >> "caliber");
private _explosive = getNumber (_ammoConfig >> "explosive"); private _explosive = getNumber (_ammoConfig >> "explosive");

3
addons/frag/functions/fnc_shouldSpall.sqf
View File

@ -18,8 +18,7 @@
params ["_ammo"]; params ["_ammo"];
GVAR(shouldSpallCache) getOrDefaultCall [ GVAR(shouldSpallCache) getOrDefaultCall [
_ammo, _ammo, {
{
(_ammo call FUNC(getSpallInfo)) params ["_caliber", "_explosive", "_indirectHit"]; (_ammo call FUNC(getSpallInfo)) params ["_caliber", "_explosive", "_indirectHit"];
_caliber >= 2.5 || (_explosive > 0 && _indirectHit >= 1) _caliber >= 2.5 || (_explosive > 0 && _indirectHit >= 1)