From 547dfff6833816eb199954d027e31b921260d971 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sat, 26 Jan 2019 18:01:41 +0100
Subject: [PATCH] Common - optimize toHex (#6788)
* optimize toHex
* Use predefined hex array in preInit
---
addons/common/XEH_preInit.sqf | 19 +++++++++++++++-
addons/common/functions/fnc_toHex.sqf | 32 ---------------------------
2 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index c29a0b5df4..f19c8cedd1 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -35,7 +35,24 @@ ACE_player = objNull;
uiNamespace setVariable ["ACE_player", objNull];
// Init toHex
-[0] call FUNC(toHex);
+GVAR(hexArray) = [
+"00","01","02","03","04","05","06","07","08","09","0A","0B","0C","0D","0E","0F",
+"10","11","12","13","14","15","16","17","18","19","1A","1B","1C","1D","1E","1F",
+"20","21","22","23","24","25","26","27","28","29","2A","2B","2C","2D","2E","2F",
+"30","31","32","33","34","35","36","37","38","39","3A","3B","3C","3D","3E","3F",
+"40","41","42","43","44","45","46","47","48","49","4A","4B","4C","4D","4E","4F",
+"50","51","52","53","54","55","56","57","58","59","5A","5B","5C","5D","5E","5F",
+"60","61","62","63","64","65","66","67","68","69","6A","6B","6C","6D","6E","6F",
+"70","71","72","73","74","75","76","77","78","79","7A","7B","7C","7D","7E","7F",
+"80","81","82","83","84","85","86","87","88","89","8A","8B","8C","8D","8E","8F",
+"90","91","92","93","94","95","96","97","98","99","9A","9B","9C","9D","9E","9F",
+"A0","A1","A2","A3","A4","A5","A6","A7","A8","A9","AA","AB","AC","AD","AE","AF",
+"B0","B1","B2","B3","B4","B5","B6","B7","B8","B9","BA","BB","BC","BD","BE","BF",
+"C0","C1","C2","C3","C4","C5","C6","C7","C8","C9","CA","CB","CC","CD","CE","CF",
+"D0","D1","D2","D3","D4","D5","D6","D7","D8","D9","DA","DB","DC","DD","DE","DF",
+"E0","E1","E2","E3","E4","E5","E6","E7","E8","E9","EA","EB","EC","ED","EE","EF",
+"F0","F1","F2","F3","F4","F5","F6","F7","F8","F9","FA","FB","FC","FD","FE","FF"
+];
isHC = !hasInterface && !isDedicated; // deprecated because no tag
missionNamespace setVariable ["ACE_isHC", ACE_isHC];
diff --git a/addons/common/functions/fnc_toHex.sqf b/addons/common/functions/fnc_toHex.sqf
index f9c82be373..697fbb9b6d 100644
--- a/addons/common/functions/fnc_toHex.sqf
+++ b/addons/common/functions/fnc_toHex.sqf
@@ -19,36 +19,4 @@ params ["_number"];
_number = ((round abs _number) max 0) min 255;
-if (isNil QGVAR(hexArray)) then {
- GVAR(hexArray) = [];
-
- private _minLength = 2;
-
- for [{_i = 0;}, {_i < 256}, {_i = _i + 1}] do {
- private _num = _i;
- private _hex = ["", "0"] select (_i == 0);
-
- while {_num > 0} do {
- private _rest = _num mod 16;
- _rest = switch _rest do {
- case 10 : {"A"};
- case 11 : {"B"};
- case 12 : {"C"};
- case 13 : {"D"};
- case 14 : {"E"};
- case 15 : {"F"};
- default {str _rest};
- };
- _num = floor (_num / 16);
- _hex = _rest + _hex;
- };
-
- while {count toArray _hex < _minLength} do {
- _hex = "0" + _hex;
- };
-
- GVAR(hexArray) pushBack _hex;
- };
-};
-
GVAR(hexArray) select _number // return