Merge pull request #250 from Vdauphin/FIX-hud_circle

FIX: HUD lift
Vdauphin · Nov 20, 2016 · 50396bc · 50396bc
2 parents 174b20d + e820944
commit 50396bc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf
@@ -472,8 +472,8 @@ btc_ropes_deployed = false;
 btc_lift_min_h  = 7;
 btc_lift_max_h  = 12;
 btc_lift_radius = 3;
-btc_lift_HUD_x  = 0.825;// * safezoneW + safezoneX;
-btc_lift_HUD_y  = 0.825;// * safezoneH + safezoneY;
+btc_lift_HUD_x  = 0.89;// * safezoneW + safezoneX;
+btc_lift_HUD_y  = 0.87;// * safezoneH + safezoneY;
 
 //Mil
 btc_player_side           = west;

diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/log/lift_hud.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/log/lift_hud.sqf
@@ -41,7 +41,7 @@ while {(Alive player && vehicle player != player) && btc_log_hud} do {
 			case (_cargo_y < 0): {_hud_y = (abs _cargo_y) / 100};
 			case (_cargo_y > 0): {_hud_y = (0 - _cargo_y) / 100};
 		};
-		_hud_x_1 = (btc_lift_HUD_x + _hud_x) * safezoneW + safezoneX;;
+		_hud_x_1 = (btc_lift_HUD_x + _hud_x) * safezoneW + safezoneX;
 		_hud_y_1 = (btc_lift_HUD_y + _hud_y) * safezoneH + safezoneY;
 		_obj_img ctrlsetposition [_hud_x_1, _hud_y_1];
 		_obj_img ctrlCommit 0;

diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/log/rsc.hpp b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/log/rsc.hpp
@@ -8,19 +8,19 @@
 		onLoad = "uiNamespace setVariable [""btc_log_hud"", _this select 0];";
 		controlsBackground[] = {};
 		objects[] = {};
-		class controls 
+		class controls
 		{
 			class Radar
 			{
 				type = 0;
 				idc = 1001;
 				style = 48;
-				
-				x = 0.75 * safezoneW + safezoneX;
+
+				x = 0.82 * safezoneW + safezoneX;
 				y = 0.75 * safezoneH + safezoneY;
-				w = 0.2 * safezoneW;
-				h = 0.2 * safezoneH;
-				
+				w = 0.14 * safezoneW;
+				h = 0.14 * safezoneH * (getresolution select 4);
+
 				font = "PuristaMedium";
 				sizeEx = 0.03;
 				colorBackground[] = {0, 0, 0, 0};
@@ -32,12 +32,12 @@
 				type = 0;
 				idc = 1002;
 				style = 48;
-				
+
 				x = 0.85 * safezoneW + safezoneX;
 				y = 0.85 * safezoneH + safezoneY;
 				w = 0.01 * safezoneW;
 				h = 0.01 * safezoneH;
-				
+
 				font = "PuristaMedium";
 				sizeEx = 0.04;
 				colorBackground[] = {0, 0, 0, 0};
@@ -49,8 +49,8 @@
 				type = 0;
 				idc = 1003;
 				style = 48;
-				
-				x = 0.75 * safezoneW + safezoneX;
+
+				x = 0.82 * safezoneW + safezoneX;
 				y = 0.7 * safezoneH + safezoneY;
 				w = 0.05 * safezoneW;
 				h = 0.05 * safezoneH;
@@ -66,12 +66,12 @@
 				type = 0;
 				idc = 1004;
 				style = 48;
-				
+
 				x = 0.95 * safezoneW + safezoneX;
 				y = 0.75 * safezoneH + safezoneY;
 				w = 0.05 * safezoneW;
 				h = 0.05 * safezoneH;
-				
+
 				font = "PuristaMedium";
 				sizeEx = 0.03;
 				colorBackground[] = {0, 0, 0, 0};
@@ -83,7 +83,7 @@
 				type = 0;
 				idc = 1005;
 				style = 0x00;
-				
+
 				x = 0.8 * safezoneW + safezoneX;
 				y = 0.65 * safezoneH + safezoneY;
 				w = 0.3 * safezoneW;
@@ -95,5 +95,5 @@
 				colorText[] = {1, 1, 1, 1};
 				text = "";
 			};
-		};   
+		};
 	};