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

Revert "fix Cfg capitalization"

Browse Source 
This reverts commit 43bda9c462.
This commit is contained in:
commy2 2015-11-30 17:00:32 +01:00
parent 43bda9c462
commit dcf0a68b80
22 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ if (GVAR(disabledInFullAutoMode) && getNumber(configFile >> "CfgWeapons" >> _wea
if (_abort || !(GVAR(extensionAvailable))) exitWith {
if (missionNamespace getVariable [QEGVAR(windDeflection,enabled), false]) then {
EGVAR(windDeflection,trackedBullets) pushBack [_bullet, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")];
EGVAR(windDeflection,trackedBullets) pushBack [_bullet, getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction")];
};
};

2
addons/attach/functions/fnc_placeApprove.sqf
View File

@ -10,7 +10,7 @@
* Arguments:
* 0: Unit (player) <OBJECT>
* 1: attachToVehicle <OBJECT>
* 2: Item Classname (CfgWeapon/CfgMagazine) <STRING>
* 2: Item Classname (cfgWeapon/cfgMagazine) <STRING>
* 3: Light Vehicle Classname <STRING>
* 4: On Attach Text <STRING>
* 5: Starting Pos of dummy item <ARRAY>

30
addons/common/define.hpp
View File

@ -261,20 +261,20 @@ class ACE_gui_listBoxBase : RscListBox{
soundExpand[] = {"",0.1,1};
soundCollapse[] = {"",0.1,1};
class ListScrollBar {
arrowEmpty = "\A3\ui_f\data\gui\Cfg\scrollbar\arrowEmpty_ca.paa";
arrowFull = "\A3\ui_f\data\gui\Cfg\scrollbar\arrowFull_ca.paa";
arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
autoScrollDelay = 5;
autoScrollEnabled = 0;
autoScrollRewind = 0;
autoScrollSpeed = -1;
border = "\A3\ui_f\data\gui\Cfg\scrollbar\border_ca.paa";
border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
color[] = {1,1,1,0.6};
colorActive[] = {1,1,1,1};
colorDisabled[] = {1,1,1,0.3};
height = 0;
scrollSpeed = 0.06;
shadow = 0;
thumb = "\A3\ui_f\data\gui\Cfg\scrollbar\thumb_ca.paa";
thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
width = 0;
};
class ScrollBar {
@ -335,20 +335,20 @@ class ACE_gui_listNBox {
thumb = "#(argb,8,8,3)color(1,1,1,1)";
};
class ListScrollBar {
arrowEmpty = "\A3\ui_f\data\gui\Cfg\scrollbar\arrowEmpty_ca.paa";
arrowFull = "\A3\ui_f\data\gui\Cfg\scrollbar\arrowFull_ca.paa";
arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
autoScrollDelay = 5;
autoScrollEnabled = 0;
autoScrollRewind = 0;
autoScrollSpeed = -1;
border = "\A3\ui_f\data\gui\Cfg\scrollbar\border_ca.paa";
border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
color[] = {1,1,1,0.6};
colorActive[] = {1,1,1,1};
colorDisabled[] = {1,1,1,0.3};
height = 0;
scrollSpeed = 0.06;
shadow = 0;
thumb = "\A3\ui_f\data\gui\Cfg\scrollbar\thumb_ca.paa";
thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
width = 0;
};
};
@ -386,26 +386,26 @@ class ACE_gui_comboBoxBase: RscCombo {
color[] = {0.3,0.3,0.3,0.6};
colorActive[] = {0.3,0.3,0.3,1};
colorDisabled[] = {0.3,0.3,0.3,0.3};
thumb = "\A3\ui_f\data\gui\Cfg\scrollbar\thumb_ca.paa";
arrowEmpty = "\A3\ui_f\data\gui\Cfg\scrollbar\arrowEmpty_ca.paa";
arrowFull = "\A3\ui_f\data\gui\Cfg\scrollbar\arrowFull_ca.paa";
thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
border = "";
};
class ComboScrollBar {
arrowEmpty = "\A3\ui_f\data\gui\Cfg\scrollbar\arrowEmpty_ca.paa";
arrowFull = "\A3\ui_f\data\gui\Cfg\scrollbar\arrowFull_ca.paa";
arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
autoScrollDelay = 5;
autoScrollEnabled = 0;
autoScrollRewind = 0;
autoScrollSpeed = -1;
border = "\A3\ui_f\data\gui\Cfg\scrollbar\border_ca.paa";
border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
color[] = {0.3,0.3,0.3,0.6};
colorActive[] = {0.3,0.3,0.3,1};
colorDisabled[] = {0.3,0.3,0.3,0.3};
height = 0;
scrollSpeed = 0.06;
shadow = 0;
thumb = "\A3\ui_f\data\gui\Cfg\scrollbar\thumb_ca.paa";
thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
width = 0;
};
};

4
addons/common/functions/fnc_getChildren.sqf
View File

@ -12,9 +12,9 @@
*/
#include "script_component.hpp"
params ["_name", "_CfgClass"];
params ["_name", "_cfgClass"];
private "_classes";
_classes = format ["configName inheritsFrom _x == '%1'", _name] configClasses (configFile >> _CfgClass);
_classes = format ["configName inheritsFrom _x == '%1'", _name] configClasses (configFile >> _cfgClass);
[_classes, {configName _this}] call FUNC(map) // return

12
addons/common/functions/fnc_getItemType.sqf
View File

@ -15,15 +15,15 @@
params ["_item"];
private ["_CfgType", "_config", "_type", "_simulation", "_default"];
private ["_cfgType", "_config", "_type", "_simulation", "_default"];
_CfgType = [_item] call FUNC(getConfigType);
_cfgType = [_item] call FUNC(getConfigType);
if (_CfgType == "") exitWith {["", ""]};
if (_cfgType == "") exitWith {["", ""]};
if (_CfgType == "CfgGlasses") exitWith {["item", "glasses"]};
if (_cfgType == "CfgGlasses") exitWith {["item", "glasses"]};
_config = configFile >> _CfgType >> _item;
_config = configFile >> _cfgType >> _item;
_type = getNumber (_config >> "type");
_simulation = getText (_config >> "simulation");
@ -31,7 +31,7 @@ if (isNumber (_config >> "ItemInfo" >> "type")) then {
_type = getNumber (_config >> "ItemInfo" >> "type");
};
_default = ["item", "magazine"] select (_CfgType == "CfgMagazines");
_default = ["item", "magazine"] select (_cfgType == "CfgMagazines");
switch (true) do {
case (_type == 0): {[_default, "unknown"]};

10
addons/common/functions/fnc_getMapGridData.sqf
View File

@ -19,12 +19,12 @@
GVAR(mapGridData) = [];
private ["_CfgGrid", "_offsetX", "_offsetY", "_zoomMax", "_formatX", "_formatY", "_stepX", "_stepY", "_zoom", "_letterGrid", "_heightOffset", "_startGrid", "_originGrid", "_realOffsetY"];
private ["_cfgGrid", "_offsetX", "_offsetY", "_zoomMax", "_formatX", "_formatY", "_stepX", "_stepY", "_zoom", "_letterGrid", "_heightOffset", "_startGrid", "_originGrid", "_realOffsetY"];
//--- Extract grid values from world config (Borrowed from BIS_fnc_gridToPos)
_CfgGrid = configFile >> "CfgWorlds" >> worldName >> "Grid";
_offsetX = getNumber (_CfgGrid >> "offsetX");
_offsetY = getNumber (_CfgGrid >> "offsetY");
_cfgGrid = configFile >> "CfgWorlds" >> worldName >> "Grid";
_offsetX = getNumber (_cfgGrid >> "offsetX");
_offsetY = getNumber (_cfgGrid >> "offsetY");
_zoomMax = 1e99;
_formatX = "";
_formatY = "";
@ -41,7 +41,7 @@ _stepY = 1e10;
_stepY = getNumber (_x >> "stepY");
};
false
} count configProperties [_CfgGrid, "isClass _x", false];
} count configProperties [_cfgGrid, "isClass _x", false];
_letterGrid = false;

6
addons/common/functions/fnc_isModLoaded.sqf
View File

@ -1,9 +1,9 @@
/*
* Author: Glowbal
* Check in CfgPatches if modification is loaded
* Check in cfgPatches if modification is loaded
*
* Arguments:
* 0: Mod Name or Classname of the mod in CfgPatches <STRING>
* 0: Mod Name or Classname of the mod in cfgPatches <STRING>
*
* Return Value:
* if modification is loaded <BOOL>
@ -14,4 +14,4 @@
params ["_modName"];
isClass (configFile >> "CfgPatches" >> _modName) // return
isClass (configFile >> "cfgPatches" >> _modName) // return

2
addons/disarming/gui_disarm.hpp
View File

@ -132,7 +132,7 @@ class GVAR(remoteInventory) {
};
class GroundName: RscText {
idc = -1;
text = "$STR_CfgVehicles_WeaponHolder0"; //"ground"
text = "$STR_cfgVehicles_WeaponHolder0"; //"ground"
x = X_PART(1);
y = Y_PART(1);
w = W_PART(12);

2
addons/explosives/XEH_postInit.sqf
View File

@ -43,7 +43,7 @@ GVAR(CurrentSpeedDial) = 0;
GVAR(placeAction) = PLACE_CANCEL;
};
//Show defuse actions on CfgAmmos (allMines):
//Show defuse actions on cfgAmmos (allMines):
_this call FUNC(interactEH);
}] call EFUNC(common,addEventHandler);

4
addons/interact_menu/functions/fnc_userActions_getHouseActions.sqf
View File

@ -111,7 +111,7 @@ _ladders = getArray (configFile >> "CfgVehicles" >> _typeOfBuilding >> "ladders"
_actionMaxDistance = 3; //interact_menu will check head -> target's offset; leave this high and do a precice distance check in condition
_actionDisplayName = localize "str_action_ladderup";
_iconImage = "\A3\ui_f\data\igui\Cfg\actions\ladderup_ca.paa";
_iconImage = "\A3\ui_f\data\igui\cfg\actions\ladderup_ca.paa";
//Ladder Up Action:
_actionOffset = [_ladderBottomMemPoint] call _fnc_getMemPointOffset;
_actionOffset = _actionOffset vectorAdd [0,0,1];
@ -120,7 +120,7 @@ _ladders = getArray (configFile >> "CfgVehicles" >> _typeOfBuilding >> "ladders"
(_memPointsActions select _memPointIndex) pushBack _action;
_actionDisplayName = localize "str_action_ladderdown";
_iconImage = "\A3\ui_f\data\igui\Cfg\actions\ladderdown_ca.paa";
_iconImage = "\A3\ui_f\data\igui\cfg\actions\ladderdown_ca.paa";
//Ladder Down Action:
_actionOffset = [_ladderTopMemPoint] call _fnc_getMemPointOffset;
_actionOffset = _actionOffset vectorAdd [0,0,0.25];

2
addons/map_gestures/functions/fnc_drawMapGestures.sqf
View File

@ -53,7 +53,7 @@ params ["_mapHandle"];
};
// Render icon and player name
_mapHandle drawIcon ["\a3\ui_f\data\gui\Cfg\Hints\icon_text\group_1_ca.paa", _color, _pos, ICON_RENDER_SIZE, ICON_RENDER_SIZE, ICON_ANGLE, "", ICON_SHADOW, TEXT_SIZE, TEXT_FONT, ICON_TEXT_ALIGN];
_mapHandle drawIcon ["\a3\ui_f\data\gui\cfg\Hints\icon_text\group_1_ca.paa", _color, _pos, ICON_RENDER_SIZE, ICON_RENDER_SIZE, ICON_ANGLE, "", ICON_SHADOW, TEXT_SIZE, TEXT_FONT, ICON_TEXT_ALIGN];
_mapHandle drawIcon ["#(argb,8,8,3)color(0,0,0,0)", GVAR(nameTextColor), _pos, TEXT_ICON_RENDER_SIZE, TEXT_ICON_RENDER_SIZE, ICON_ANGLE, name _x, TEXT_SHADOW, TEXT_SIZE, TEXT_FONT, ICON_TEXT_ALIGN];
};
};

2
addons/markers/functions/fnc_initInsertMarker.sqf
View File

@ -128,7 +128,7 @@
if (isMultiplayer) then {
_pos set [1,_posY + 5 * _posH + 7 * BORDER];
_pos set [3,_posH];
_descriptionChannel ctrlsetstructuredtext parsetext format ["<t size='0.8'>%1</t>", (localize "str_a3_Cfgvehicles_modulerespawnposition_f_arguments_marker_0") + ":"];
_descriptionChannel ctrlsetstructuredtext parsetext format ["<t size='0.8'>%1</t>", (localize "str_a3_cfgvehicles_modulerespawnposition_f_arguments_marker_0") + ":"];
_descriptionChannel ctrlsetposition _pos;
_descriptionChannel ctrlcommit 0;

2
addons/medical/config.cpp
View File

@ -17,7 +17,7 @@ class CfgPatches {
#include "CfgFactionClasses.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "CfgSounds.hpp"
#include "CFgSounds.hpp"
#include "ACE_Medical_Treatments.hpp"
#include "ACE_Settings.hpp"
#include "UI\RscTitles.hpp"

4
addons/nametags/functions/fnc_initIsSpeaking.sqf
View File

@ -37,14 +37,14 @@ if (!hasInterface) exitWith {};
}] call EFUNC(common,addEventHandler);
if (isClass (configFile >> "CfgPatches" >> "acre_api")) then {
if (isClass (configFile >> "cfgPatches" >> "acre_api")) then {
ACE_LOGINFO("ACRE Detected.");
DFUNC(isSpeaking) = {
params ["_unit"];
([_unit] call acre_api_fnc_isSpeaking) && {!(_unit getVariable ["ACE_isUnconscious", false])}
};
} else {
if (isClass (configFile >> "CfgPatches" >> "task_force_radio")) then {
if (isClass (configFile >> "cfgPatches" >> "task_force_radio")) then {
ACE_LOGINFO("TFR Detected.");
DFUNC(isSpeaking) = {
params ["_unit"];

2
addons/optics/CfgWeapons.hpp
View File

@ -34,7 +34,7 @@ class CfgWeapons {
_generalMacro = "ACE_optic_DMS";
scope = 1;
displayName = "LOCALIZE ACE DMS";
//descriptionShort = "$STR_A3_CfgWEAPONS_ACC_DMS1";
//descriptionShort = "$STR_A3_CFGWEAPONS_ACC_DMS1";
weaponInfoType = "ACE_RscWeaponZeroing";
class ItemInfo: ItemInfo {

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

@ -32,6 +32,6 @@ if (!((_bullet isKindOf "BulletBase") || (_bullet isKindOf "GrenadeBase"))) exit
if (_unit distance ACE_player > GVAR(simulationRadius)) exitWith {false};
if (!([_unit] call EFUNC(common,isPlayer))) exitWith {false};
GVAR(trackedBullets) pushBack [_bullet, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")];
GVAR(trackedBullets) pushBack [_bullet, getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction")];
true;

2
addons/zeus/config.cpp
View File

@ -10,7 +10,7 @@ class CfgPatches {
authorUrl = "https://github.com/SilentSpike";
VERSION_CONFIG;
};
// Use additional CfgPatches to contextually remove modules from zeus
// Use additional cfgPatches to contextually remove modules from zeus
class GVAR(captives): ADDON {
units[] = {
QGVAR(moduleCaptive),

8
addons/zeus/functions/fnc_bi_moduleCurator.sqf
View File

@ -68,9 +68,9 @@ if (_activated) then {
//--- All (including unofficial ones)
case 3: {
_CfgPatches = configfile >> "Cfgpatches";
for "_i" from 0 to (count _CfgPatches - 1) do {
_class = _CfgPatches select _i;
_cfgPatches = configfile >> "cfgpatches";
for "_i" from 0 to (count _cfgPatches - 1) do {
_class = _cfgPatches select _i;
if (isclass _class) then {_addons set [count _addons,configname _class];};
};
_addons call bis_fnc_activateaddons;
@ -311,7 +311,7 @@ if (_activated) then {
if (count (actionkeys "curatorInterface") == 0) then {
[
format [
localize "str_a3_Cfgvehicles_modulecurator_f_keyNotAssigned",
localize "str_a3_cfgvehicles_modulecurator_f_keyNotAssigned",
(["IGUI","WARNING_RGB"] call bis_fnc_displaycolorget) call bis_fnc_colorRGBAtoHTML
]
] call bis_fnc_guiMessage;

2
addons/zeus/functions/fnc_bi_moduleMine.sqf
View File

@ -21,7 +21,7 @@ _units = _this select 1;
_activated = _this select 2;
if (_activated) then {
_explosive = gettext (configfile >> "Cfgvehicles" >> typeof _logic >> "explosive");
_explosive = gettext (configfile >> "cfgvehicles" >> typeof _logic >> "explosive");
if (_explosive != "") then {
_explosive = createvehicle [_explosive,position _logic,[],0,"none"];
_explosive attachto [_logic];

10
addons/zeus/functions/fnc_bi_moduleProjectile.sqf
View File

@ -39,17 +39,17 @@ if ({local _x} count (objectcurators _logic) > 0) then {
if !(isserver) exitwith {};
if (_activated) then {
_ammo = _logic getvariable ["type",gettext (configfile >> "Cfgvehicles" >> typeof _logic >> "ammo")];
_ammo = _logic getvariable ["type",gettext (configfile >> "cfgvehicles" >> typeof _logic >> "ammo")];
if (_ammo != "") then {
_CfgAmmo = configfile >> "Cfgammo" >> _ammo;
//if !(isclass _CfgAmmo) exitwith {["CfgAmmo class '%1' not found.",_ammo] call bis_fnc_error;};
_cfgAmmo = configfile >> "cfgammo" >> _ammo;
//if !(isclass _cfgAmmo) exitwith {["CfgAmmo class '%1' not found.",_ammo] call bis_fnc_error;};
_dirVar = _fnc_scriptname + typeof _logic;
_logic setdir (missionnamespace getvariable [_dirVar,direction _logic]); //--- Restore custom direction
_pos = getposatl _logic;
_posAmmo = +_pos;
_posAmmo set [2,0];
_dir = direction _logic;
_simulation = tolower gettext (configfile >> "Cfgammo" >> _ammo >> "simulation");
_simulation = tolower gettext (configfile >> "cfgammo" >> _ammo >> "simulation");
_altitude = 0;
_velocity = [];
_attach = false;
@ -65,7 +65,7 @@ if (_activated) then {
_altitude = 1000;
_velocity = [0,0,-100];
_radio = "SentGenIncoming";
_sounds = if (getnumber (_CfgAmmo >> "hit") < 200) then {["mortar1","mortar2"]} else {["shell1","shell2","shell3","shell4"]};
_sounds = if (getnumber (_cfgAmmo >> "hit") < 200) then {["mortar1","mortar2"]} else {["shell1","shell2","shell3","shell4"]};
_sound = _sounds call bis_fnc_selectrandom;
_hint = ["Curator","PlaceOrdnance"];
_shakeStrength = 0.01;

10
addons/zeus/functions/fnc_bi_moduleRemoteControl.sqf
View File

@ -33,11 +33,11 @@ if (_activated && local _logic && !isnull curatorcamera) then {
//--- Check if the unit is suitable
_error = "";
if !(side group _unit in [east,west,resistance,civilian]) then {_error = localize "str_a3_Cfgvehicles_moduleremotecontrol_f_errorEmpty";};
if (isplayer _unit) then {_error = localize "str_a3_Cfgvehicles_moduleremotecontrol_f_errorPlayer";};
if !(alive _unit) then {_error = localize "str_a3_Cfgvehicles_moduleremotecontrol_f_errorDestroyed";};
if (isnull _unit) then {_error = localize "str_a3_Cfgvehicles_moduleremotecontrol_f_errorNull";};
if !(isnull (_unit getvariable ["bis_fnc_moduleRemoteControl_owner",objnull])) then {_error = localize "str_a3_Cfgvehicles_moduleremotecontrol_f_errorControl";};
if !(side group _unit in [east,west,resistance,civilian]) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorEmpty";};
if (isplayer _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorPlayer";};
if !(alive _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorDestroyed";};
if (isnull _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorNull";};
if !(isnull (_unit getvariable ["bis_fnc_moduleRemoteControl_owner",objnull])) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorControl";};
if (_error == "") then {
_unit spawn {

16
addons/zeus/functions/fnc_handleZeusUnitAssigned.sqf
View File

@ -19,7 +19,7 @@
#include "script_component.hpp"
private ["_removeAddons", "_numCfgs", "_Cfg", "_requiredAddon"];
private ["_removeAddons", "_numCfgs", "_cfg", "_requiredAddon"];
if !(isClass (configFile >> "ACE_Curator")) exitWith { ERROR("The ACE_Curator class does not exist") };
@ -28,21 +28,21 @@ _removeAddons = [];
_numCfgs = count (configFile >> "ACE_Curator");
for "_n" from 0 to (_numCfgs - 1) do {
_Cfg = (configFile >> "ACE_Curator") select _n;
_cfg = (configFile >> "ACE_Curator") select _n;
if (isArray _Cfg) then {
_requiredAddon = getArray _Cfg;
if (isArray _cfg) then {
_requiredAddon = getArray _cfg;
{
if !(isClass (configFile >> "CfgPatches" >> _x)) exitWith {
_removeAddons pushBack (configName _Cfg);
_removeAddons pushBack (configName _cfg);
};
} forEach _requiredAddon;
};
if (isText _Cfg) then {
_requiredAddon = getText _Cfg;
if (isText _cfg) then {
_requiredAddon = getText _cfg;
if !(isClass (configFile >> "CfgPatches" >> _requiredAddon)) then {
_removeAddons pushBack (configName _Cfg);
_removeAddons pushBack (configName _cfg);
};
};
};