diff --git a/BC_buyables/cfgFunctions.hpp b/BC_buyables/cfgFunctions.hpp index 6478c821..070b0e8e 100644 --- a/BC_buyables/cfgFunctions.hpp +++ b/BC_buyables/cfgFunctions.hpp @@ -6,8 +6,6 @@ class BC_buyables { class clientInit { preInit = 1; }; class configureBluforStartVehicle; class configureOpforStartVehicle; - class disableCollision; class serverInit { postInit = 1; }; - class terminalLocalityEH; }; }; \ No newline at end of file diff --git a/BC_buyables/functions/fn_configureOpforStartVehicle.sqf b/BC_buyables/functions/fn_configureOpforStartVehicle.sqf index ca762240..c34cbba9 100644 --- a/BC_buyables/functions/fn_configureOpforStartVehicle.sqf +++ b/BC_buyables/functions/fn_configureOpforStartVehicle.sqf @@ -30,9 +30,4 @@ _vehicle addItemCargoGlobal ["ACE_SpraypaintBlue",10]; _vehicle addItemCargoGlobal ["ACE_SpraypaintGreen",10]; _vehicle addItemCargoGlobal ["ACE_SpraypaintRed",10]; _vehicle addItemCargoGlobal ["ACE_EntrenchingTool",10]; -_vehicle addItemCargoGlobal ["TFAR_fadak",10]; - -[_vehicle, _terminal] remoteExecCall ["disableCollisionWith", 0, _vehicle]; -[_vehicle, _terminal] remoteExecCall ["disableCollisionWith", 0, _terminal]; - -[_vehicle] remoteExec ["BC_buyables_fnc_terminalLocalityEH", 0, true]; \ No newline at end of file +_vehicle addItemCargoGlobal ["TFAR_fadak",10]; \ No newline at end of file diff --git a/BC_buyables/functions/fn_disableCollision.sqf b/BC_buyables/functions/fn_disableCollision.sqf deleted file mode 100644 index da6f7717..00000000 --- a/BC_buyables/functions/fn_disableCollision.sqf +++ /dev/null @@ -1,9 +0,0 @@ -params ["_vehicle"]; - -private _terminal = missionNameSpace getVariable ["GRAD_tracking_terminalObj", objNull]; - -if (!local _vehicle && !local _terminal) exitWith {}; - -diag_log format ["disabling collision between %1 - %2", _terminal, _vehicle]; - -_vehicle disableCollisionWith _terminal; \ No newline at end of file diff --git a/BC_buyables/functions/fn_terminalLocalityEH.sqf b/BC_buyables/functions/fn_terminalLocalityEH.sqf deleted file mode 100644 index 116f6259..00000000 --- a/BC_buyables/functions/fn_terminalLocalityEH.sqf +++ /dev/null @@ -1,11 +0,0 @@ -params ["_vehicle"]; - -_vehicle addEventHandler ["Local", { - params ["_entity", "_isLocal"]; - - diag_log format ["locality changed of %1 - %2 now", _entity, _isLocal]; - - if (_isLocal) then { - [_entity] call BC_buyables_fnc_disableCollision; - }; -}]; \ No newline at end of file diff --git a/BC_setup/functions/client/fn_addInteractions.sqf b/BC_setup/functions/client/fn_addInteractions.sqf index 12930002..9d99d456 100644 --- a/BC_setup/functions/client/fn_addInteractions.sqf +++ b/BC_setup/functions/client/fn_addInteractions.sqf @@ -188,8 +188,10 @@ if (!hasInterface) exitWith {}; _radioVeh = missionNamespace getVariable ["GRAD_tracking_radioVehObj", objNull]; detach _terminal; - // set a bit above ground - _terminal setPos [getPos _terminal select 0, getPos _terminal select 1, 0.1]; + + // safely put down + _terminal setVehiclePosition [_radioVeh getRelPos [2, 180], [], 6, "NONE"]; + GRAD_TERMINAL = true; publicVariable "GRAD_TERMINAL"; [_terminal, true, [0,1.4,0], 270] remoteExec ["ace_dragging_fnc_setDraggable", 0, true];