Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use configOf command #1419

Merged
merged 2 commits into from
Feb 13, 2021
Merged

Use configOf command #1419

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c40ad94
Use configOf command
PabstMirror Feb 9, 2021
4ace9c2
Optimize common case of CBA_fnc_getObjectConfig
PabstMirror Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/common/fnc_isTurnedOut.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ params ["_unit"];

private _out = false;
private _vehicle = vehicle _unit;
private _cfg = configFile >> "CfgVehicles" >> typeOf _vehicle;
private _cfg = configOf _vehicle;

if (_vehicle != _unit) then {
if (driver _vehicle == _unit) then {
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_randomizeFacewear.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private _randomizationDisabled = getArray (missionConfigFile >> "disableRandomiz
if (_randomizationDisabled || {!(_unit getVariable ["BIS_enableRandomization", true])}) exitWith {true};

// Get list
private _facewearList = getArray (configFile >> "CfgVehicles" >> typeOf _unit >> "CBA_facewearList");
private _facewearList = getArray (configOf _unit >> "CBA_facewearList");
if (_facewearList isEqualTo []) exitWith {true};

// Apply
Expand Down
2 changes: 1 addition & 1 deletion addons/disposable/fnc_replaceMagazineCargo.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if (magazineCargo _box arrayIntersect GVAR(magazines) isEqualTo []) exitWith {};
private _magazines = magazinesAmmoCargo _box;
clearMagazineCargoGlobal _box;

private _isBackpack = getNumber (configFile >> "CfgVehicles" >> typeOf _box >> "isBackpack") != -1;
private _isBackpack = getNumber (configOf _box >> "isBackpack") != -1;

{
_x params ["_magazine", "_ammo"];
Expand Down
2 changes: 1 addition & 1 deletion addons/main/script_mod.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD

// MINIMAL required version for the Mod. Components can specify others..
#define REQUIRED_VERSION 1.98
#define REQUIRED_VERSION 2.00

/*
// Defined DEBUG_MODE_NORMAL in a few CBA_fncs to prevent looped logging :)
Expand Down
2 changes: 1 addition & 1 deletion addons/optics/fnc_currentOptic.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private _vehicleOptic = "";

if (_vehicle != _unit) then {
// todo: turrets
_vehicleOptic = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "CBA_ScriptedOpticClass");
_vehicleOptic = getText (configOf _vehicle >> "CBA_ScriptedOpticClass");
};

if (_vehicleOptic != "") exitWith {_vehicleOptic};
Expand Down
2 changes: 1 addition & 1 deletion addons/xeh/fnc_initEvents.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ params ["_unit"];
if !(ISPROCESSED(_unit)) then {
SETPROCESSED(_unit);

private _class = configFile >> "CfgVehicles" >> typeOf _unit;
private _class = configOf _unit;
private _eventClass = _class >> "EventHandlers" >> QUOTE(XEH_CLASS);

// adds ability to disable XEH completely on a unit, by manually clearing the CBA event handler class.
Expand Down