From 8f4420f88d8dff562908f878a475bc205636ce38 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 19 Oct 2017 11:27:30 -0400 Subject: [PATCH] Update Event1.sqf Only do the marker resizing of core Epoch mod markers since it causes issues with mission markers. Also shrank the sizes a bit after discussion with @xDrokz --- .../compile/setup/masterLoop/Event1.sqf | 73 ++++++++++--------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf index 2b9a29e2..fda39bd2 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf @@ -384,40 +384,45 @@ if(visibleMap)then{ if(isNil {EPOCH_lastMapScale})then{EPOCH_lastMapScale = 0}; for "_i" from 0 to ((count _zoomMarkers) - 1) do { _zoomMarker = _zoomMarkers select _i; - 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 [1,1]; - }; - case ( (_mapScale >= 0.5) && (_mapScale < 0.55) ): { - _zoomMarker setMarkerSizeLocal [1.1,1.1]; - }; - case ( (_mapScale >= 0.45) && (_mapScale < 0.5) ): { - _zoomMarker setMarkerSizeLocal [1.2,1.2]; - }; - case ( (_mapScale >= 0.35) && (_mapScale < 0.45) ): { - _zoomMarker setMarkerSizeLocal [1.4,1.4]; - }; - case ( (_mapScale >= 0.25) && (_mapScale < 0.35) ): { - _zoomMarker setMarkerSizeLocal [1.666,1.666]; - }; - case ( (_mapScale >= 0.15) && (_mapScale < 0.25) ): { - _zoomMarker setMarkerSizeLocal [1.8,1.8]; - }; - case ( (_mapScale >= 0.1) && (_mapScale < 0.15) ): { - _zoomMarker setMarkerSizeLocal [1.9,1.9]; - }; - case ( (_mapScale >= 0.0666) && (_mapScale < 0.1) ): { - _zoomMarker setMarkerSizeLocal [2.2,2.2]; - }; - case ( (_mapScale >= 0) && (_mapScale < 0.0666) ): { - _zoomMarker setMarkerSizeLocal [2.666,2.666]; + 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]; + }; }; }; };