Merge branch 'master' into master_daily

Vdauphin · Jun 4, 2022 · aa55584 · aa55584
2 parents abc61b5 + 4ca9a75
commit aa55584
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 39 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -18,7 +18,7 @@ template: |
     - [Iron Front 3 Lite](https://steamcommunity.com/sharedfiles/filedetails/?id=2648308937), [Face of War WW2](https://steamcommunity.com/sharedfiles/filedetails/?id=891433622)
     - [Operation: TREBUCHET](https://steamcommunity.com/sharedfiles/filedetails/?id=769440155), [JM's Long Live The Empire](https://steamcommunity.com/sharedfiles/filedetails/?id=2588430396), [Scion Conflict](https://steamcommunity.com/sharedfiles/filedetails/?id=2478080991), [Operation: TREBUCHET First Contact](https://steamcommunity.com/workshop/filedetails/?id=1572627279)
 
-    [Changelog](https://github.com/Vdauphin/HeartsAndMinds/milestone/77?closed=1):
+    [Changelog](https://github.com/Vdauphin/HeartsAndMinds/milestone/78?closed=1):
 
     - Mission.sqm/Param.hpp not changed.
     $CHANGES
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
@@ -2,7 +2,7 @@
 btc_version = [
     1,
     22,
-    3
+    4
 ];
 diag_log format (["=BTC= HEARTS AND MINDS VERSION %1.%2.%3"] + btc_version);
 

diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/int/orders.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/int/orders.sqf
@@ -50,26 +50,32 @@ if (isNull _unit) then {
         ["btc_global_reputation"] remoteExecCall ["btc_int_fnc_ask_var", 2];
 
         [{!(isNil "btc_int_ask_data")}, {
+            params ["_unit", "_pos"];
             private _rep = btc_int_ask_data;
 
             if (_rep >= btc_rep_level_normal) then {
                 [name _unit, localize "STR_BTC_HAM_CON_INT_ORDERS_SHOWMAP"] call btc_fnc_showSubtitle;
                 openMap true;
-                ["1", "onMapSingleClick", {
-                    if (surfaceIsWater _pos) then {
-                        [name (_this select 4), localize "STR_BTC_HAM_CON_INT_ORDERS_ONLAND"] call btc_fnc_showSubtitle;
-                    } else {
-                        [[_this select 4], 0, 4, _pos] remoteExecCall ["btc_int_fnc_orders_give", _this select 4];
-                        ["1", "onMapSingleClick"] call BIS_fnc_removeStackedEventHandler;
-                        openMap false;
-                        private _textMap = selectRandom [
-                                localize "STR_BTC_HAM_CON_INT_ORDERS_TAXI_OK1",
-                                localize "STR_BTC_HAM_CON_INT_ORDERS_TAXI_OK2",
-                                localize "STR_BTC_HAM_CON_INT_ORDERS_TAXI_OK3"
-                        ];
-                        [name (_this select 4), _textMap] call btc_fnc_showSubtitle;
-                    };
-                }, [_unit]] call BIS_fnc_addStackedEventHandler;
+                addMissionEventHandler ["MapSingleClick", 
+                    {
+                        params ["_units", "_pos"];
+                        private _unit = _thisArgs select 0;
+                        if (surfaceIsWater _pos) then {
+                            [name _unit, localize "STR_BTC_HAM_CON_INT_ORDERS_ONLAND"] call btc_fnc_showSubtitle;
+                        } else {
+                            [[_unit], 0, 4, _pos] remoteExecCall ["btc_int_fnc_orders_give", _unit];
+                            removeMissionEventHandler ["MapSingleClick", _thisEventHandler];
+                            openMap false;
+                            private _textMap = selectRandom [
+                                    localize "STR_BTC_HAM_CON_INT_ORDERS_TAXI_OK1",
+                                    localize "STR_BTC_HAM_CON_INT_ORDERS_TAXI_OK2",
+                                    localize "STR_BTC_HAM_CON_INT_ORDERS_TAXI_OK3"
+                            ];
+                            [name _unit, _textMap] call btc_fnc_showSubtitle;
+                        };
+                    },
+                    [_unit]
+                ];
             } else {
                 if !(player getVariable ["interpreter", false]) exitWith {
                     [name _unit, localize "STR_BTC_HAM_CON_INFO_ASKREP_NOINTER"] call btc_fnc_showSubtitle;