Merge branch 'master' of https://github.com/johnb432/Tao-folding-map

johnb432 · Jul 9, 2024 · b0490f9 · b0490f9
2 parents 7c97cb0 + 951b965
commit b0490f9
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,14 @@
-# Changelog for Tao's Folding Map Rewrite 13.4.2023
+# Changelog for Tao's Folding Map Rewrite 9.7.2024
+
+4.2.7.0
+- Fixed bug where GPS panel would be opened.
+
+# Changelog for Tao's Folding Map Rewrite 13.4.2024
 
 4.2.6.0
 - Fixed bug where GPS was not detected.
 
-# Changelog for Tao's Folding Map Rewrite 13.4.2023
+# Changelog for Tao's Folding Map Rewrite 13.4.2024
 
 4.2.5.0
 - Added latest hemtt support.

diff --git a/addons/main/functions/fnc_PFHautomatic.sqf b/addons/main/functions/fnc_PFHautomatic.sqf
@@ -11,7 +11,7 @@
  * None
  *
  * Example:
- * [player, (uiNamespace getVariable ["tao_rewrite_main_foldmap", displayNull]) displayCtrl tao_rewrite_main_mapCtrlActive] call tao_rewrite_main_fnc_PFHautomatic;
+ * [player, (uiNamespace getVariable ["tao_rewrite_main_foldmap", displayNull]) displayCtrl tao_rewrite_main_mapCtrlActive] call tao_rewrite_main_fnc_PFHautomatic
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_PFHmanual.sqf b/addons/main/functions/fnc_PFHmanual.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * ((uiNamespace getVariable ["tao_rewrite_main_foldmap", displayNull]) displayCtrl tao_rewrite_main_mapCtrlActive) call tao_rewrite_main_fnc_PFHmanual;
+ * ((uiNamespace getVariable ["tao_rewrite_main_foldmap", displayNull]) displayCtrl tao_rewrite_main_mapCtrlActive) call tao_rewrite_main_fnc_PFHmanual
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_findGPS.sqf b/addons/main/functions/fnc_findGPS.sqf
@@ -10,15 +10,12 @@
  * None
  *
  * Example:
- * player call tao_rewrite_main_fnc_findGPS;
+ * player call tao_rewrite_main_fnc_findGPS
  *
  * Public: No
  */
 
-// Small piece of code from ACE
-private _gpsOpened = visibleGPS;
-private _gpsAvailable = openGPS true;
+private _panels = flatten (_this infoPanelComponents "left");
+private _index = _panels find "MinimapDisplayComponent";
 
-if (!_gpsOpened) then {openGPS false};
-
-GVAR(hasGPS) = _gpsAvailable || {(GVAR(itemsGPS) findAny (items _this)) != -1};
+GVAR(hasGPS) = (_index != -1 && {_panels select (_index + 1)}) || {(GVAR(itemsGPS) findAny (items _this)) != -1}
diff --git a/addons/main/functions/fnc_fleximenu.sqf b/addons/main/functions/fnc_fleximenu.sqf
@@ -10,7 +10,7 @@
  * Fleximenu <ARRAY>
  *
  * Example:
- * call tao_rewrite_main_fnc_fleximenu;
+ * call tao_rewrite_main_fnc_fleximenu
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_onLoadDialog.sqf b/addons/main/functions/fnc_onLoadDialog.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * call tao_rewrite_main_fnc_onLoadDialog;
+ * call tao_rewrite_main_fnc_onLoadDialog
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_openFoldmap.sqf b/addons/main/functions/fnc_openFoldmap.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * call tao_rewrite_main_fnc_openFoldmap;
+ * call tao_rewrite_main_fnc_openFoldmap
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_refreshAfterSettingChange.sqf b/addons/main/functions/fnc_refreshAfterSettingChange.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * "tao_rewrite_main_fnc_toggleMap" call tao_rewrite_main_fnc_refreshAfterSettingChange;
+ * "tao_rewrite_main_fnc_toggleMap" call tao_rewrite_main_fnc_refreshAfterSettingChange
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_refreshMap.sqf b/addons/main/functions/fnc_refreshMap.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * call tao_rewrite_main_fnc_refreshMap;
+ * call tao_rewrite_main_fnc_refreshMap
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_toggleMap.sqf b/addons/main/functions/fnc_toggleMap.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * call tao_rewrite_main_fnc_toggleMap;
+ * call tao_rewrite_main_fnc_toggleMap
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_toggleNvMode.sqf b/addons/main/functions/fnc_toggleNvMode.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * call tao_rewrite_main_fnc_toggleNvMode;
+ * call tao_rewrite_main_fnc_toggleNvMode
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_zoomIn.sqf b/addons/main/functions/fnc_zoomIn.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * call tao_rewrite_main_fnc_zoomIn;
+ * call tao_rewrite_main_fnc_zoomIn
  *
  * Public: No
  */

diff --git a/addons/main/functions/fnc_zoomOut.sqf b/addons/main/functions/fnc_zoomOut.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * call tao_rewrite_main_fnc_zoomOut;
+ * call tao_rewrite_main_fnc_zoomOut
  *
  * Public: No
  */

diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 4
 #define MINOR 2
-#define PATCHLVL 6
+#define PATCHLVL 7
 #define BUILD 0