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

small fixes for explosives and interaction

Browse Source
This commit is contained in:
Nicolás Badano 2015-01-14 10:11:46 -03:00
parent b868e9a35c
commit 167497ec2f
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/explosives/CfgVehicles.hpp
View File

@ -8,7 +8,7 @@ class CfgVehicles {
class CAManBase: Man {
class ACE_SelfActions {
class GVAR(Explosives) {
class ACE_Explosives {
displayName = $STR_ACE_Explosives_Menu;
condition = QUOTE( !(_player getVariable [ARR_2('ace_explosives_PlantingExplosive',false)]) );
statement = "";

6
addons/explosives/functions/fnc_setupExplosive.sqf
View File

@ -43,7 +43,7 @@ if (!isNil "_timer") then {
GVAR(Setup) setVariable [QGVAR(Timer), _timer];
};
[_unit, "ACE_Explosives", true] call EFUNC(Core,setForceWalkStatus);
[_unit, "ACE_Explosives", true] call EFUNC(common,setForceWalkStatus);
GVAR(TweakedAngle) = 180;
[QGVAR(Placement),"OnEachFrame", {
private "_player";
@ -62,6 +62,6 @@ GVAR(TweakedAngle) = 180;
[localize "STR_ACE_Explosives_PlaceAction", localize "STR_ACE_Explosives_CancelAction",
localize "STR_ACE_Explosives_ScrollAction"] call EFUNC(Interaction,showMouseHint);
_unit setVariable [QGVAR(Place), [_unit, "DefaultAction",
{GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Approve);}] call EFUNC(Core,AddActionEventHandler)];
{GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Approve);}] call EFUNC(common,AddActionEventHandler)];
_unit setVariable [QGVAR(Cancel), [_unit, "MenuBack",
{GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Cancel);}] call EFUNC(Core,AddActionEventHandler)];
{GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Cancel);}] call EFUNC(common,AddActionEventHandler)];

2
addons/interaction/Menu_Config.hpp
View File

@ -587,7 +587,7 @@ class RscTitles {
};
};
};
class ACE_InteractionHelper {
class GVAR(InteractionHelper) {
idd = 9930;
enableSimulation = 1;
movingEnable = 0;

2
addons/interaction/config.cpp
View File

@ -18,8 +18,6 @@ class CfgPatches {
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include <Menu_Config.hpp>
class ACE_Default_Keys {

2
addons/interaction/functions/fnc_hideMouseHint.sqf
View File

@ -18,5 +18,5 @@
if (isNull (uiNamespace getVariable ["ACE_Helper_Display", objNull])) exitWith{};
("ACE_InteractionHelper" call BIS_fnc_rscLayer) cutText ["", "PLAIN"];
(QGVAR(InteractionHelper) call BIS_fnc_rscLayer) cutText ["", "PLAIN"];
showHUD true;