Extensions - Replace ace_parse_imagepath with SQF regexFind (#8243)

acemod · Oct 10, 2021 · 94c62d8 · 94c62d8
1 parent 64decdd
commit 94c62d8
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 80 deletions.
diff --git a/ace_parse_imagepath.dll b/ace_parse_imagepath.dll
diff --git a/ace_parse_imagepath_x64.dll b/ace_parse_imagepath_x64.dll
diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp
@@ -27,8 +27,4 @@ class ACE_Extensions {
         windows = 1;
         client = 1;
     };
-    class ace_parse_imagepath {
-        windows = 1;
-        client = 1;
-    };
 };
diff --git a/addons/interact_menu/functions/fnc_userActions_getHouseActions.sqf b/addons/interact_menu/functions/fnc_userActions_getHouseActions.sqf
@@ -91,8 +91,7 @@ for "_index" from 0 to ((count _configPath) - 1) do {
     _actionCondition = compile _actionCondition;
     _actionMaxDistance = _actionMaxDistance + 0.1; //increase range slightly
 
-    //extension ~4x as fast:
-    private _iconImage =  "ace_parse_imagepath" callExtension _actionDisplayNameDefault;
+    private _iconImage = ((_actionDisplayNameDefault regexFind ["[\w\-\\\/]+.paa/gi", 0]) param [0, [""]]) select 0;
 
     private _actionOffset = [_actionPosition] call _fnc_getMemPointOffset;
     private _memPointIndex = _memPoints find _actionPosition;

diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt
@@ -141,7 +141,6 @@ add_subdirectory(break_line)
 add_subdirectory(clipboard)
 add_subdirectory(advanced_ballistics)
 #add_subdirectory(medical) # After medical re-write this extension is no longer used
-add_subdirectory(parse_imagepath)
 add_subdirectory(artillerytables)
 
 # Test Extension for dynamically loading/unloading built extensions; does not build in release

diff --git a/extensions/parse_imagepath/CMakeLists.txt b/extensions/parse_imagepath/CMakeLists.txt
diff --git a/extensions/parse_imagepath/ace_parse_imagepath.cpp b/extensions/parse_imagepath/ace_parse_imagepath.cpp