Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

add config mapOnZoomSetMarkerSize

Browse Source
This commit is contained in:
DirtySanchez 2017-10-19 11:30:42 -05:00
parent 04d3d1d64d
commit 4aa72d5a5d
2 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
View File

@ -376,57 +376,58 @@ if(_markerName in allMapMarkers)then{
}forEach _markerArray; }forEach _markerArray;
}; };
}; };
if(getNumber(('CfgEpochClient' call EPOCH_returnConfig) >> 'mapOnZoomSetMarkerSize') isEqualTo 1)then{
if(visibleMap)then{ if(visibleMap)then{
_mapControl = (findDisplay 12) displayCtrl 51; _mapControl = (findDisplay 12) displayCtrl 51;
_mapScale = ctrlMapScale _mapControl; _mapScale = ctrlMapScale _mapControl;
_zoomMarkers = allMapMarkers; _zoomMarkers = allMapMarkers;
if(isNil {EPOCH_lastMapScale})then{EPOCH_lastMapScale = 0}; if(isNil {EPOCH_lastMapScale})then{EPOCH_lastMapScale = 0};
for "_i" from 0 to ((count _zoomMarkers) - 1) do { for "_i" from 0 to ((count _zoomMarkers) - 1) do {
_zoomMarker = _zoomMarkers select _i; _zoomMarker = _zoomMarkers select _i;
private "_markerString"; private "_markerString";
_markerString = toArray _zoomMarker; _markerString = toArray _zoomMarker;
_markerString resize 6; _markerString resize 6;
if (toString _markerString == "EPOCH_") then { if (toString _markerString == "EPOCH_") then {
switch(true)do{ switch(true)do{
case ( (_mapScale >= 0.95) && (_mapScale <= 1) ): { case ( (_mapScale >= 0.95) && (_mapScale <= 1) ): {
_zoomMarker setMarkerSizeLocal [0.666,0.666]; _zoomMarker setMarkerSizeLocal [0.666,0.666];
//_zoomMarker setMarkerAlphaLocal 0; //_zoomMarker setMarkerAlphaLocal 0;
}; };
case ( (_mapScale >= 0.75) && (_mapScale < 0.95) ): { case ( (_mapScale >= 0.75) && (_mapScale < 0.95) ): {
_zoomMarker setMarkerSizeLocal [0.8,0.8]; _zoomMarker setMarkerSizeLocal [0.8,0.8];
}; };
case ( (_mapScale >= 0.55) && (_mapScale < 0.75) ): { case ( (_mapScale >= 0.55) && (_mapScale < 0.75) ): {
_zoomMarker setMarkerSizeLocal [0.9,0.9]; _zoomMarker setMarkerSizeLocal [0.9,0.9];
}; };
case ( (_mapScale >= 0.5) && (_mapScale < 0.55) ): { case ( (_mapScale >= 0.5) && (_mapScale < 0.55) ): {
_zoomMarker setMarkerSizeLocal [1.0,1.0]; _zoomMarker setMarkerSizeLocal [1.0,1.0];
}; };
case ( (_mapScale >= 0.45) && (_mapScale < 0.5) ): { case ( (_mapScale >= 0.45) && (_mapScale < 0.5) ): {
_zoomMarker setMarkerSizeLocal [1.1,1.1]; _zoomMarker setMarkerSizeLocal [1.1,1.1];
}; };
case ( (_mapScale >= 0.35) && (_mapScale < 0.45) ): { case ( (_mapScale >= 0.35) && (_mapScale < 0.45) ): {
_zoomMarker setMarkerSizeLocal [1.2,1.2]; _zoomMarker setMarkerSizeLocal [1.2,1.2];
}; };
case ( (_mapScale >= 0.25) && (_mapScale < 0.35) ): { case ( (_mapScale >= 0.25) && (_mapScale < 0.35) ): {
_zoomMarker setMarkerSizeLocal [1.3,1.3]; _zoomMarker setMarkerSizeLocal [1.3,1.3];
}; };
case ( (_mapScale >= 0.15) && (_mapScale < 0.25) ): { case ( (_mapScale >= 0.15) && (_mapScale < 0.25) ): {
_zoomMarker setMarkerSizeLocal [1.4,1.4]; _zoomMarker setMarkerSizeLocal [1.4,1.4];
}; };
case ( (_mapScale >= 0.1) && (_mapScale < 0.15) ): { case ( (_mapScale >= 0.1) && (_mapScale < 0.15) ): {
_zoomMarker setMarkerSizeLocal [1.5,1.5]; _zoomMarker setMarkerSizeLocal [1.5,1.5];
}; };
case ( (_mapScale >= 0.0666) && (_mapScale < 0.1) ): { case ( (_mapScale >= 0.0666) && (_mapScale < 0.1) ): {
_zoomMarker setMarkerSizeLocal [1.6,1.6]; _zoomMarker setMarkerSizeLocal [1.6,1.6];
}; };
case ( (_mapScale >= 0) && (_mapScale < 0.0666) ): { case ( (_mapScale >= 0) && (_mapScale < 0.0666) ): {
_zoomMarker setMarkerSizeLocal [1.7,1.7]; _zoomMarker setMarkerSizeLocal [1.7,1.7];
};
}; };
}; };
}; };
EPOCH_lastMapScale = _mapScale;
}; };
EPOCH_lastMapScale = _mapScale;
}; };
// force update // force update

5
Sources/epoch_config/Configs/CfgEpochClient.hpp
View File

@ -176,8 +176,9 @@ class CfgEpochClient
playerKilledScreen = "TapOut2"; playerKilledScreen = "TapOut2";
playerDisableRevenge = 0; playerDisableRevenge = 0;
playerRevengeMinAliveTime = 900; playerRevengeMinAliveTime = 900;
playerLocationMarkerGPSOnly = 1; // Map marker toggle in map dyna menu with assigned GPS only playerLocationMarkerGPSOnly = 1; // Map marker toggle in map dyna menu with assigned GPS only
playerDeathMarkerGPSOnly = 1; // Map marker toggle in map dyna menu on death with assigned GPS only playerDeathMarkerGPSOnly = 1; // Map marker toggle in map dyna menu on death with assigned GPS only
mapOnZoomSetMarkerSize = 1; // When in map markers will change to larger size as player zooms in
bankTransferTime[] = {0.0006,1.2,0.06}; bankTransferTime[] = {0.0006,1.2,0.06};
// Favorite Bar // Favorite Bar