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

Changed all core external to common as the rename was done.

Browse Source
This commit is contained in:
Garth L-H de Wet 2015-01-12 22:39:37 +02:00
parent 57b766b48b
commit 4926694bda
10 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/explosives/XEH_postInit.sqf
View File

@ -22,7 +22,7 @@ GVAR(PlacedCount) = 0;
GVAR(Setup) = objNull; GVAR(Setup) = objNull;
GVAR(pfeh_running) = false; GVAR(pfeh_running) = false;
[{(_this select 0) call FUNC(handleScrollWheel);}] call FUNC(Core,addScrollWheelEventHandler); [{(_this select 0) call FUNC(handleScrollWheel);}] call EFUNC(Common,addScrollWheelEventHandler);
player addEventHandler ["Killed", { player addEventHandler ["Killed", {
private "_deadman"; private "_deadman";
call FUNC(place_Cancel); call FUNC(place_Cancel);

2
addons/explosives/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {"ACE_Clacker", "ACE_DefusalKit", "ACE_M26_Clacker", "ACE_DeadManSwitch"}; weapons[] = {"ACE_Clacker", "ACE_DefusalKit", "ACE_M26_Clacker", "ACE_DeadManSwitch"};
requiredVersion = 0.60; requiredVersion = 0.60;
requiredAddons[] = {ace_core, ace_interaction}; requiredAddons[] = {ace_common, ace_interaction};
version = "0.95"; version = "0.95";
versionStr = "0.95"; versionStr = "0.95";
versionAr[] = {0,95,0}; versionAr[] = {0,95,0};

2
addons/explosives/functions/fnc_canDefuse.sqf
View File

@ -19,7 +19,7 @@
private "_unit"; private "_unit";
_unit = _this select 0; _unit = _this select 0;
if (vehicle _unit != _unit || {!("ACE_DefusalKit" in (items _unit))}) exitWith {false}; if (vehicle _unit != _unit || {!("ACE_DefusalKit" in (items _unit))}) exitWith {false};
_isSpecialist = [_unit] call EFUNC(Core,isEOD); _isSpecialist = [_unit] call EFUNC(Common,isEOD);
if (GVAR(RequireSpecialist) && {!_isSpecialist}) exitWith {false}; if (GVAR(RequireSpecialist) && {!_isSpecialist}) exitWith {false};

4
addons/explosives/functions/fnc_module.sqf
View File

@ -22,7 +22,7 @@ _activated = _this select 2;
if !(_activated) exitWith {}; if !(_activated) exitWith {};
[_logic, QGVAR(RequireSpecialist), "RequireSpecialist" ] call EFUNC(Core,readBooleanParameterFromModule); [_logic, QGVAR(RequireSpecialist), "RequireSpecialist" ] call EFUNC(Common,readBooleanParameterFromModule);
[_logic, QGVAR(PunishNonSpecialists), "PunishNonSpecialists" ] call EFUNC(Core,readBooleanParameterFromModule); [_logic, QGVAR(PunishNonSpecialists), "PunishNonSpecialists" ] call EFUNC(Common,readBooleanParameterFromModule);
diag_log text "[ACE]: Explosive Module Initialized."; diag_log text "[ACE]: Explosive Module Initialized.";

2
addons/explosives/functions/fnc_openTransmitterUI.sqf
View File

@ -36,7 +36,7 @@ _detonators = [_unit] call FUNC(getDetonators);
if (count _detonators == 0) then { if (count _detonators == 0) then {
call EFUNC(Interaction,hideMenu); call EFUNC(Interaction,hideMenu);
"ACE_Explosives" call EFUNC(Interaction,openMenuSelf); "ACE_Explosives" call EFUNC(Interaction,openMenuSelf);
[format[localize "STR_ACE_Explosives_NoTriggersAvailable", "player"]] call EFUNC(Core,displayTextStructured); [format[localize "STR_ACE_Explosives_NoTriggersAvailable", "player"]] call EFUNC(Common,displayTextStructured);
}else{ }else{
[ [
_actions, _actions,

2
addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
View File

@ -47,7 +47,7 @@ _count = 0;
if (_count == 0) then { if (_count == 0) then {
[ACE_player] call FUNC(openPlaceUI); [ACE_player] call FUNC(openPlaceUI);
[format[localize "STR_ACE_Explosives_NoTriggersAvailable", [format[localize "STR_ACE_Explosives_NoTriggersAvailable",
getText(configFile >> "CfgMagazines" >> _magazine >> "DisplayName")]] call EFUNC(Core,displayTextStructured); getText(configFile >> "CfgMagazines" >> _magazine >> "DisplayName")]] call EFUNC(Common,displayTextStructured);
}else{ }else{
[ [
_actions, _actions,

2
addons/explosives/functions/fnc_placeExplosive.sqf
View File

@ -57,6 +57,6 @@ if (isText(_triggerConfig >> "onPlace") && {[_unit,_explosive,_magazineClass,_tr
call compile (getText (_triggerConfig >> "onPlace"))}) exitWith {_explosive}; call compile (getText (_triggerConfig >> "onPlace"))}) exitWith {_explosive};
if (_setDir) then { if (_setDir) then {
[[_explosive, _dir, getNumber (_magazineTrigger >> "pitch")], QUOTE(FUNC(setPosition))] [[_explosive, _dir, getNumber (_magazineTrigger >> "pitch")], QUOTE(FUNC(setPosition))]
call EFUNC(Core,execRemoteFnc); call EFUNC(Common,execRemoteFnc);
}; };
_explosive _explosive

8
addons/explosives/functions/fnc_place_Approve.sqf
View File

@ -24,11 +24,11 @@ if (GVAR(pfeh_running)) then {
private ["_mag", "_setup", "_player"]; private ["_mag", "_setup", "_player"];
_setup = GVAR(Setup); _setup = GVAR(Setup);
GVAR(Setup) = objNull; GVAR(Setup) = objNull;
[GVAR(placer), "ACE_Explosives", false] call EFUNC(Core,setForceWalkStatus); [GVAR(placer), "ACE_Explosives", false] call EFUNC(Common,setForceWalkStatus);
GVAR(placer) = objNull; GVAR(placer) = objNull;
_player = ACE_player; _player = ACE_player;
[_player, "DefaultAction", _player getVariable [QGVAR(Place), -1]] call EFUNC(Core,removeActionEventHandler); [_player, "DefaultAction", _player getVariable [QGVAR(Place), -1]] call EFUNC(Common,removeActionEventHandler);
[_player, "MenuBack", _player getVariable [QGVAR(Cancel), -1]] call EFUNC(Core,removeActionEventHandler); [_player, "MenuBack", _player getVariable [QGVAR(Cancel), -1]] call EFUNC(Common,removeActionEventHandler);
call EFUNC(Interaction,hideMouseHint); call EFUNC(Interaction,hideMouseHint);
if ((_setup getVariable [QGVAR(Class), ""]) != "") then { if ((_setup getVariable [QGVAR(Class), ""]) != "") then {
_dir = (getDir _setup); _dir = (getDir _setup);
@ -73,7 +73,7 @@ if ((_setup getVariable [QGVAR(Class), ""]) != "") then {
if (!isNull (_this select 1)) then { if (!isNull (_this select 1)) then {
_explosive attachTo [(_this select 1)]; _explosive attachTo [(_this select 1)];
_dir = _dir - (getDir (_this select 1)); _dir = _dir - (getDir (_this select 1));
[[_explosive, _dir, 0], QUOTE(FUNC(setPosition))] call EFUNC(Core,execRemoteFnc); [[_explosive, _dir, 0], QUOTE(FUNC(setPosition))] call EFUNC(Common,execRemoteFnc);
}; };
}; };
}; };

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

@ -28,8 +28,8 @@ GVAR(Setup) = objNull;
if (isNil {GVAR(placer)}) then { if (isNil {GVAR(placer)}) then {
GVAR(placer) = objNull; GVAR(placer) = objNull;
}; };
[GVAR(placer), "ACE_Explosives", false] call EFUNC(Core,setForceWalkStatus); [GVAR(placer), "ACE_Explosives", false] call EFUNC(Common,setForceWalkStatus);
GVAR(placer) = objNull; GVAR(placer) = objNull;
call EFUNC(Interaction,hideMouseHint); call EFUNC(Interaction,hideMouseHint);
[ACE_player, "DefaultAction", ACE_player getVariable [QGVAR(Place), -1]] call EFUNC(Core,removeActionEventHandler); [ACE_player, "DefaultAction", ACE_player getVariable [QGVAR(Place), -1]] call EFUNC(Common,removeActionEventHandler);
[ACE_player, "MenuBack", ACE_player getVariable [QGVAR(Cancel), -1]] call EFUNC(Core,removeActionEventHandler); [ACE_player, "MenuBack", ACE_player getVariable [QGVAR(Cancel), -1]] call EFUNC(Common,removeActionEventHandler);

12
addons/explosives/functions/fnc_startDefuse.sqf
View File

@ -41,10 +41,10 @@ if (STANCE _unit == "Prone") then {
if (ACE_player != _unit) then { if (ACE_player != _unit) then {
// If the unit is a player, call the function on the player. // If the unit is a player, call the function on the player.
if (isPlayer _unit) then { if (isPlayer _unit) then {
[[_unit, _target], QUOTE(FUNC(startDefuse)), _unit] call EFUNC(Core,execRemoteFnc); [[_unit, _target], QUOTE(FUNC(startDefuse)), _unit] call EFUNC(Common,execRemoteFnc);
} else { } else {
// TODO: use scheduled delay execution // TODO: use scheduled delay execution
[_unit, _target, [[_unit] call EFUNC(Core,isEOD), _target] call _fnc_DefuseTime] spawn { [_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn {
(_this select 0) playActionNow _actionToPlay; (_this select 0) playActionNow _actionToPlay;
(_this select 0) disableAI "MOVE"; (_this select 0) disableAI "MOVE";
(_this select 0) disableAI "TARGET"; (_this select 0) disableAI "TARGET";
@ -57,12 +57,12 @@ if (ACE_player != _unit) then {
} else { } else {
_unit playActionNow _actionToPlay; _unit playActionNow _actionToPlay;
if (GVAR(RequireSpecialist)) then { if (GVAR(RequireSpecialist)) then {
if ([_unit] call EFUNC(Core,isEOD)) then { if ([_unit] call EFUNC(Common,isEOD)) then {
[[true, _target] call _fnc_DefuseTime, [_unit,_target], [[true, _target] call _fnc_DefuseTime, [_unit,_target],
QUOTE(FUNC(defuseExplosive)), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Core,progressBar); QUOTE(FUNC(defuseExplosive)), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Common,progressBar);
}; };
} else { } else {
[[([_unit] call EFUNC(Core,isEOD)), _target] call _fnc_DefuseTime, [_unit,_target], [[([_unit] call EFUNC(Common,isEOD)), _target] call _fnc_DefuseTime, [_unit,_target],
QUOTE(FUNC(defuseExplosive)), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Core,progressBar); QUOTE(FUNC(defuseExplosive)), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Common,progressBar);
}; };
}; };