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

more common code cleanup

Browse Source
This commit is contained in:
commy2 2015-09-21 19:19:49 +02:00
parent 8503d15c9b
commit 5a5242f1c9
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/functions/fnc_assignedItemFix.sqf
View File

@ -35,6 +35,8 @@ GVAR(AssignedItemsShownItems) = [
_assignedItems = _assignedItems select 17;
GVAR(AssignedItemsShownItems) = [true, true, true, true, true];
{
if !(_x in GVAR(AssignedItems)) then {
GVAR(AssignedItems) pushBack _x;

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

@ -15,7 +15,7 @@
params ["_item"];
private ["_cfgType", "_config", "_type", "_default"];
private ["_cfgType", "_config", "_type", "_simulation", "_default"];
_cfgType = [_item] call FUNC(getConfigType);
@ -25,6 +25,7 @@ if (_cfgType == "CfgGlasses") exitWith {["item", "glasses"]};
_config = configFile >> _cfgType >> _item;
_type = getNumber (_config >> "type");
_simulation = getText (_config >> "simulation");
if (isNumber (_config >> "ItemInfo" >> "type")) then {
_type = getNumber (_config >> "ItemInfo" >> "type");
@ -63,7 +64,7 @@ switch (true) do {
case (_type == 801): {["item", "uniform"]};
case (_type == 2^12): {
switch (toLower getText (_config >> "simulation")) do {
switch (toLower _simulation) do {
case ("weapon"): {["weapon", "binocular"]};
case ("binocular"): {["weapon", "binocular"]};
case ("nvgoggles"): {["item", "nvgoggles"]};
@ -73,6 +74,15 @@ switch (true) do {
};
case (_type == 2^16): {["weapon", "vehicle"]};
case (_type == 2^17): {[_default, "unknown"]}; // ???
case (_type == 2^17): {
switch (toLower _simulation) do {
case ("itemmap"): {["item", "map"]};
case ("itemgps"): {["item", "gps"]};
case ("itemradio"): {["item", "radio"]};
case ("itemcompass"): {["item", "compass"]};
case ("itemwatch"): {["item", "watch"]};
default {[_default, "unknown"]};
};
};
default {[_default, "unknown"]};
};