Merge pull request #10 from tuntematonjr/dev

Fix bigger picture
tuntematonjr · Dec 10, 2023 · 1755688 · 1755688
2 parents 4368dfa + fd21b52
commit 1755688
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 21 deletions.
diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 1
 #define MINOR 3
-#define PATCH 2
+#define PATCH 3
 #define BUILD 20231210
diff --git a/addons/startmarkers/functions/fnc_settingsDisplay.sqf b/addons/startmarkers/functions/fnc_settingsDisplay.sqf
@@ -34,4 +34,7 @@ if (_open) then {
 } else {
 	[] call FUNC(createSquadMarkers);
 	[] call FUNC(createVehicleMarkers);
-};
+};
+
+
+
diff --git a/addons/unconInfo/$PBOPREFIX$ → addons/unconinfo/$PBOPREFIX$ b/addons/unconInfo/$PBOPREFIX$ → addons/unconinfo/$PBOPREFIX$
diff --git a/addons/unconInfo/CfgEventHandlers.hpp → addons/unconinfo/CfgEventHandlers.hpp b/addons/unconInfo/CfgEventHandlers.hpp → addons/unconinfo/CfgEventHandlers.hpp
diff --git a/addons/unconInfo/Stringtable.xml → addons/unconinfo/Stringtable.xml b/addons/unconInfo/Stringtable.xml → addons/unconinfo/Stringtable.xml
diff --git a/addons/unconInfo/XEH_postInit.sqf → addons/unconinfo/XEH_postInit.sqf b/addons/unconInfo/XEH_postInit.sqf → addons/unconinfo/XEH_postInit.sqf
diff --git a/addons/unconInfo/XEH_postInit_client.sqf → addons/unconinfo/XEH_postInit_client.sqf b/addons/unconInfo/XEH_postInit_client.sqf → addons/unconinfo/XEH_postInit_client.sqf
diff --git a/addons/unconInfo/XEH_preInit.sqf → addons/unconinfo/XEH_preInit.sqf b/addons/unconInfo/XEH_preInit.sqf → addons/unconinfo/XEH_preInit.sqf
diff --git a/addons/unconInfo/XEH_preStart.sqf → addons/unconinfo/XEH_preStart.sqf b/addons/unconInfo/XEH_preStart.sqf → addons/unconinfo/XEH_preStart.sqf
diff --git a/addons/unconInfo/XEH_prep.hpp → addons/unconinfo/XEH_prep.hpp b/addons/unconInfo/XEH_prep.hpp → addons/unconinfo/XEH_prep.hpp
diff --git a/addons/unconInfo/config.cpp → addons/unconinfo/config.cpp b/addons/unconInfo/config.cpp → addons/unconinfo/config.cpp
diff --git a/...s/unconInfo/functions/fnc_hideMessage.sqf → ...s/unconinfo/functions/fnc_hideMessage.sqf b/...s/unconInfo/functions/fnc_hideMessage.sqf → ...s/unconinfo/functions/fnc_hideMessage.sqf
diff --git a/addons/unconInfo/functions/fnc_unconInfo.sqf → addons/unconinfo/functions/fnc_unconInfo.sqf b/addons/unconInfo/functions/fnc_unconInfo.sqf → addons/unconinfo/functions/fnc_unconInfo.sqf
diff --git a/.../unconInfo/functions/script_component.hpp → .../unconinfo/functions/script_component.hpp b/.../unconInfo/functions/script_component.hpp → .../unconinfo/functions/script_component.hpp
diff --git a/addons/unconInfo/script_component.hpp → addons/unconinfo/script_component.hpp b/addons/unconInfo/script_component.hpp → addons/unconinfo/script_component.hpp
diff --git a/addons/utilities/biggerImage.hpp b/addons/utilities/biggerImage.hpp
@@ -1,13 +1,13 @@
-
 class GVAR(biggerPictureInBriefingUI)
 {
-	idd = 330000;
+	idd = BIGGER_PICTURE_MAIN_IDD;
+	onUnload = "_display closeDisplay 1;";
 	class ControlsBackground
 	{
 		class GVAR(BiggerPictureBackground): RscText
 		{
-			x = "safeZoneW + safeZoneX * 0.175156";
-			y = "safeZoneH + safeZoneY * 0.148";
+			x = "safeZoneX + safeZoneW * 0.175156";
+			y = "safeZoneY + safeZoneH * 0.148";
 			w = "safeZoneW * 0.665156";
 			h = "safeZoneH * 0.704";
 			style = 0;	
@@ -19,19 +19,19 @@ class GVAR(biggerPictureInBriefingUI)
 	{
 		class GVAR(biggerPictureImage) : RscPictureKeepAspect
 		{
-			idc = 330001;
-			x = "safeZoneW + safeZoneX * 0.175156";
-			y = "safeZoneH + safeZoneY * 0.148";
+			idc = BIGGER_PICTURE_IMAGE_IDC;
+			x = "safeZoneX + safeZoneW * 0.175156";
+			y = "safeZoneY + safeZoneH * 0.148";
 			w = "safeZoneW * 0.665156";
 			h = "safeZoneH * 0.704";
 			text = "";
 		};
 
 		class GVAR(exitButton) : RscButton
 		{
-			idc = 330002;
-			x = "safeZoneW + safeZoneX * 0.783593";
-			y = "safeZoneH + safeZoneY * 0.148";
+			idc = BIGGER_PICTURE_BUTTON_IDC;
+			x = "safeZoneX + safeZoneW * 0.783593";
+			y = "safeZoneY + safeZoneH * 0.148";
 			w = "safeZoneW * 0.0515625";
 			h = "safeZoneH * 0.044";
 			//style = 0+2;

diff --git a/addons/utilities/functions/fnc_createBriefingBiggerPicture.sqf b/addons/utilities/functions/fnc_createBriefingBiggerPicture.sqf
@@ -16,6 +16,6 @@
 
 params ["_text", "_imagePath"];
 
-private _text = format[ "<br/><font face='PuristaBold' size='15'><execute expression='[ %4 ] call %2'>%3 - Click here to open as bigger</execute></font> <br/><img image='%1' width='370m'/>", _imagePath, QFUNC(openBiggerPicture), _text, str _imagePath];
+private _text = format[ "<br/><font face='PuristaBold' size='15'><execute expression='[%4] call %2'>%3 - Click here to open as bigger</execute></font> <br/><img image='%1' width='370m'/>", _imagePath, QFUNC(openBiggerPicture), _text, str _imagePath];
 
 _text
diff --git a/addons/utilities/functions/fnc_openBiggerPicture.sqf b/addons/utilities/functions/fnc_openBiggerPicture.sqf
@@ -12,14 +12,21 @@
  * [_imagePath] call tunuti_utilities_fnc_openBiggerPicture
  */
 #include "script_component.hpp"
-
 params ["_imagePath"];
-private _display = findDisplay TUNUTI_FIND_MAPDISPLAY;
 
-private _control = _display createDisplay QGVAR(biggerPictureInBriefingUI);
-uiNamespace setVariable [QGVAR(biggerPictureInBriefingUI), _control ];
-[{!isNull findDisplay 330000}, {
+private _display = uiNamespace getVariable [QGVAR(biggerPictureInBriefingUI), displayNull];
+
+if (!isNull _display) then {
+	_display closeDisplay 1;
+	diag_log "suljettiin vanha";
+};
+
+private _control = findDisplay TUNUTI_FIND_MAPDISPLAY createDisplay QGVAR(biggerPictureInBriefingUI);
+uiNamespace setVariable [QGVAR(biggerPictureInBriefingUI), _control];
+
+[{!isNull findDisplay BIGGER_PICTURE_MAIN_IDD}, {
 	private _imagePath = _this;
-	_textControl = (uiNamespace getVariable QGVAR(biggerPictureInBriefingUI)) displayCtrl 330001;
+	_textControl = (uiNamespace getVariable QGVAR(biggerPictureInBriefingUI)) displayCtrl BIGGER_PICTURE_IMAGE_IDC;
 	_textControl ctrlSetText _imagePath;
-}, _imagePath] call CBA_fnc_waitUntilAndExecute;
+
+}, _imagePath] call CBA_fnc_waitUntilAndExecute; 
diff --git a/addons/utilities/script_component.hpp b/addons/utilities/script_component.hpp
@@ -12,4 +12,9 @@
     #define DEBUG_SETTINGS DEBUG_SETTINGS_UTILITIES
 #endif
 
-#include "\x\tunuti\addons\main\script_macros.hpp"
+#include "\x\tunuti\addons\main\script_macros.hpp"
+
+#define BIGGER_PICTURE_MAIN_IDD 333333
+#define BIGGER_PICTURE_IMAGE_IDC 333334
+#define BIGGER_PICTURE_BUTTON_IDC 333335
+