From 4926694bda4d3b7f13f27190eae6b1bed8e3582a Mon Sep 17 00:00:00 2001 From: Garth L-H de Wet Date: Mon, 12 Jan 2015 22:39:37 +0200 Subject: [PATCH] Changed all core external to common as the rename was done. --- addons/explosives/XEH_postInit.sqf | 2 +- addons/explosives/config.cpp | 2 +- addons/explosives/functions/fnc_canDefuse.sqf | 2 +- addons/explosives/functions/fnc_module.sqf | 4 ++-- .../explosives/functions/fnc_openTransmitterUI.sqf | 2 +- .../functions/fnc_openTriggerSelectionUI.sqf | 2 +- addons/explosives/functions/fnc_placeExplosive.sqf | 2 +- addons/explosives/functions/fnc_place_Approve.sqf | 8 ++++---- addons/explosives/functions/fnc_place_Cancel.sqf | 6 +++--- addons/explosives/functions/fnc_startDefuse.sqf | 12 ++++++------ 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf index adc6c1108e..2d8cfb31ae 100644 --- a/addons/explosives/XEH_postInit.sqf +++ b/addons/explosives/XEH_postInit.sqf @@ -22,7 +22,7 @@ GVAR(PlacedCount) = 0; GVAR(Setup) = objNull; 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", { private "_deadman"; call FUNC(place_Cancel); diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp index 2c93bcc6c4..dcf5e98634 100644 --- a/addons/explosives/config.cpp +++ b/addons/explosives/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { units[] = {}; weapons[] = {"ACE_Clacker", "ACE_DefusalKit", "ACE_M26_Clacker", "ACE_DeadManSwitch"}; requiredVersion = 0.60; - requiredAddons[] = {ace_core, ace_interaction}; + requiredAddons[] = {ace_common, ace_interaction}; version = "0.95"; versionStr = "0.95"; versionAr[] = {0,95,0}; diff --git a/addons/explosives/functions/fnc_canDefuse.sqf b/addons/explosives/functions/fnc_canDefuse.sqf index 9d08d795f6..f145d85f93 100644 --- a/addons/explosives/functions/fnc_canDefuse.sqf +++ b/addons/explosives/functions/fnc_canDefuse.sqf @@ -19,7 +19,7 @@ private "_unit"; _unit = _this select 0; 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}; diff --git a/addons/explosives/functions/fnc_module.sqf b/addons/explosives/functions/fnc_module.sqf index 44e3cf5321..8381e55b42 100644 --- a/addons/explosives/functions/fnc_module.sqf +++ b/addons/explosives/functions/fnc_module.sqf @@ -22,7 +22,7 @@ _activated = _this select 2; if !(_activated) exitWith {}; -[_logic, QGVAR(RequireSpecialist), "RequireSpecialist" ] call EFUNC(Core,readBooleanParameterFromModule); -[_logic, QGVAR(PunishNonSpecialists), "PunishNonSpecialists" ] call EFUNC(Core,readBooleanParameterFromModule); +[_logic, QGVAR(RequireSpecialist), "RequireSpecialist" ] call EFUNC(Common,readBooleanParameterFromModule); +[_logic, QGVAR(PunishNonSpecialists), "PunishNonSpecialists" ] call EFUNC(Common,readBooleanParameterFromModule); diag_log text "[ACE]: Explosive Module Initialized."; diff --git a/addons/explosives/functions/fnc_openTransmitterUI.sqf b/addons/explosives/functions/fnc_openTransmitterUI.sqf index fcd305d9bd..3cec06e34d 100644 --- a/addons/explosives/functions/fnc_openTransmitterUI.sqf +++ b/addons/explosives/functions/fnc_openTransmitterUI.sqf @@ -36,7 +36,7 @@ _detonators = [_unit] call FUNC(getDetonators); if (count _detonators == 0) then { call EFUNC(Interaction,hideMenu); "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{ [ _actions, diff --git a/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf b/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf index 95d882cb6c..72c2c54012 100644 --- a/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf +++ b/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf @@ -47,7 +47,7 @@ _count = 0; if (_count == 0) then { [ACE_player] call FUNC(openPlaceUI); [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{ [ _actions, diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf index 823ac700b6..2d945757d5 100644 --- a/addons/explosives/functions/fnc_placeExplosive.sqf +++ b/addons/explosives/functions/fnc_placeExplosive.sqf @@ -57,6 +57,6 @@ if (isText(_triggerConfig >> "onPlace") && {[_unit,_explosive,_magazineClass,_tr call compile (getText (_triggerConfig >> "onPlace"))}) exitWith {_explosive}; if (_setDir) then { [[_explosive, _dir, getNumber (_magazineTrigger >> "pitch")], QUOTE(FUNC(setPosition))] - call EFUNC(Core,execRemoteFnc); + call EFUNC(Common,execRemoteFnc); }; _explosive diff --git a/addons/explosives/functions/fnc_place_Approve.sqf b/addons/explosives/functions/fnc_place_Approve.sqf index 88635341fb..fd127ab271 100644 --- a/addons/explosives/functions/fnc_place_Approve.sqf +++ b/addons/explosives/functions/fnc_place_Approve.sqf @@ -24,11 +24,11 @@ if (GVAR(pfeh_running)) then { private ["_mag", "_setup", "_player"]; _setup = GVAR(Setup); GVAR(Setup) = objNull; -[GVAR(placer), "ACE_Explosives", false] call EFUNC(Core,setForceWalkStatus); +[GVAR(placer), "ACE_Explosives", false] call EFUNC(Common,setForceWalkStatus); GVAR(placer) = objNull; _player = ACE_player; -[_player, "DefaultAction", _player getVariable [QGVAR(Place), -1]] call EFUNC(Core,removeActionEventHandler); -[_player, "MenuBack", _player getVariable [QGVAR(Cancel), -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(Common,removeActionEventHandler); call EFUNC(Interaction,hideMouseHint); if ((_setup getVariable [QGVAR(Class), ""]) != "") then { _dir = (getDir _setup); @@ -73,7 +73,7 @@ if ((_setup getVariable [QGVAR(Class), ""]) != "") then { if (!isNull (_this select 1)) then { _explosive attachTo [(_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); }; }; }; diff --git a/addons/explosives/functions/fnc_place_Cancel.sqf b/addons/explosives/functions/fnc_place_Cancel.sqf index f06d7e5584..1d5ddd498e 100644 --- a/addons/explosives/functions/fnc_place_Cancel.sqf +++ b/addons/explosives/functions/fnc_place_Cancel.sqf @@ -28,8 +28,8 @@ GVAR(Setup) = objNull; if (isNil {GVAR(placer)}) then { GVAR(placer) = objNull; }; -[GVAR(placer), "ACE_Explosives", false] call EFUNC(Core,setForceWalkStatus); +[GVAR(placer), "ACE_Explosives", false] call EFUNC(Common,setForceWalkStatus); GVAR(placer) = objNull; call EFUNC(Interaction,hideMouseHint); -[ACE_player, "DefaultAction", ACE_player getVariable [QGVAR(Place), -1]] call EFUNC(Core,removeActionEventHandler); -[ACE_player, "MenuBack", ACE_player getVariable [QGVAR(Cancel), -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(Common,removeActionEventHandler); diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index 2106f3f842..a44b03ae22 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -41,10 +41,10 @@ if (STANCE _unit == "Prone") then { if (ACE_player != _unit) then { // If the unit is a player, call the function on the player. 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 { // 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) disableAI "MOVE"; (_this select 0) disableAI "TARGET"; @@ -57,12 +57,12 @@ if (ACE_player != _unit) then { } else { _unit playActionNow _actionToPlay; 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], - 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 { - [[([_unit] call EFUNC(Core,isEOD)), _target] call _fnc_DefuseTime, [_unit,_target], - QUOTE(FUNC(defuseExplosive)), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Core,progressBar); + [[([_unit] call EFUNC(Common,isEOD)), _target] call _fnc_DefuseTime, [_unit,_target], + QUOTE(FUNC(defuseExplosive)), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Common,progressBar); }; };