From 9297fa539e79f13699be0c848dcd817c64df5fac Mon Sep 17 00:00:00 2001
From: DirtySanchez <donkeypunch.info@gmail.com>
Date: Fri, 20 Oct 2017 11:15:09 -0500
Subject: [PATCH] onZoomMarkerScaling upgrade

use better mapScale value management and calculation
---
 .../compile/setup/masterLoop/Event1.sqf       | 66 ++++++-------------
 1 file changed, 21 insertions(+), 45 deletions(-)

diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
index 2a83c63f..c0cb2541 100644
--- a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
+++ b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
@@ -383,55 +383,31 @@ if(_markerName in allMapMarkers)then{
 };
 if(getNumber(('CfgEpochClient' call EPOCH_returnConfig) >> 'mapOnZoomSetMarkerSize') isEqualTo 1)then{
 	if(visibleMap)then{
-		_mapControl = (findDisplay 12) displayCtrl 51;
-		_mapScale = ctrlMapScale _mapControl;
-		_zoomMarkers = allMapMarkers;
+		_mapScale = ctrlMapScale ((findDisplay 12) displayCtrl 51);
+		_mapMarkers = allMapMarkers;
+		{
+			if((uiNamespace getVariable[_x,[]]) isEqualTo [])then {uiNamespace setVariable[_x,[(getMarkerSize _x) select 0,(getMarkerSize _x) select 1]]};
+		}forEach _mapMarkers;
+		
 		if(isNil {EPOCH_lastMapScale})then{EPOCH_lastMapScale = 0};
-		for "_i" from 0 to ((count _zoomMarkers) - 1) do {
-			_zoomMarker = _zoomMarkers select _i;
-			private "_markerString";
-			_markerString = toArray _zoomMarker;
-			_markerString resize 6;
-			if (toString _markerString == "EPOCH_") then {
-				switch(true)do{
-					case ( (_mapScale >= 0.95) && (_mapScale <= 1) ): {
-						_zoomMarker setMarkerSizeLocal [0.666,0.666];
-						//_zoomMarker setMarkerAlphaLocal 0;
-					};
-					case ( (_mapScale >= 0.75) && (_mapScale < 0.95) ): {
-						_zoomMarker setMarkerSizeLocal [0.8,0.8];
-					};
-					case ( (_mapScale >= 0.55) && (_mapScale < 0.75) ): {
-						_zoomMarker setMarkerSizeLocal [0.9,0.9];
-					};
-					case ( (_mapScale >= 0.5) && (_mapScale < 0.55) ): {
-						_zoomMarker setMarkerSizeLocal [1.0,1.0];
-					};
-					case ( (_mapScale >= 0.45) && (_mapScale < 0.5) ): {
-						_zoomMarker setMarkerSizeLocal [1.1,1.1];
-					};
-					case ( (_mapScale >= 0.35) && (_mapScale < 0.45) ): {
-						_zoomMarker setMarkerSizeLocal [1.2,1.2];
-					};
-					case ( (_mapScale >= 0.25) && (_mapScale < 0.35) ): {
-						_zoomMarker setMarkerSizeLocal [1.3,1.3];
-					};
-					case ( (_mapScale >= 0.15) && (_mapScale < 0.25) ): {
-						_zoomMarker setMarkerSizeLocal [1.4,1.4];
-					};
-					case ( (_mapScale >= 0.1) && (_mapScale < 0.15) ): {
-						_zoomMarker setMarkerSizeLocal [1.5,1.5];
-					};
-					case ( (_mapScale >= 0.0666) && (_mapScale < 0.1) ): {
-						_zoomMarker setMarkerSizeLocal [1.6,1.6];
-					};
-					case ( (_mapScale >= 0) && (_mapScale < 0.0666) ): {
-						_zoomMarker setMarkerSizeLocal [1.7,1.7];
-					};
+		
+		//if( (_mapScale != EPOCH_lastMapScale) && ((_mapScale >=0.15) && (_mapScale <=0.95)) )then{
+		if(_mapScale != EPOCH_lastMapScale)then{
+			EPOCH_lastMapScale = _mapScale;
+			for "_i" from 0 to ((count _mapMarkers) - 1) do {
+				_zoomMarker = _mapMarkers select _i;
+				private "_markerString";
+				_markerString = toArray _zoomMarker;
+				_markerString resize 6;
+				if (toString _markerString == "EPOCH_") then {
+					_var = uiNamespace getVariable[_zoomMarker,[0.8,0.8]];					
+					_sizeX = (((_var select 0) / _mapScale) min 2.5) max 0.666;
+					_sizeY = (((_var select 1) / _mapScale) min 2.5) max 0.666;
+					_zoomMarker setMarkerSizeLocal [_sizeX,_sizeY];
 				};
 			};
+			// EPOCH_lastMapScale = _mapScale;
 		};
-		EPOCH_lastMapScale = _mapScale;
 	};
 };