From 5a5242f1c9a2e2d32c3dcc175044f810f55cca93 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Mon, 21 Sep 2015 19:19:49 +0200
Subject: [PATCH] more common code cleanup

---
 addons/common/functions/fnc_assignedItemFix.sqf |  2 ++
 addons/common/functions/fnc_getItemType.sqf     | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/common/functions/fnc_assignedItemFix.sqf b/addons/common/functions/fnc_assignedItemFix.sqf
index ed381cfc9b..9f804eaa4d 100644
--- a/addons/common/functions/fnc_assignedItemFix.sqf
+++ b/addons/common/functions/fnc_assignedItemFix.sqf
@@ -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;
diff --git a/addons/common/functions/fnc_getItemType.sqf b/addons/common/functions/fnc_getItemType.sqf
index 4d6ee932fa..ec20b46f74 100644
--- a/addons/common/functions/fnc_getItemType.sqf
+++ b/addons/common/functions/fnc_getItemType.sqf
@@ -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"]};
 };