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

remove deprecated code for 3.8.0 (#4457)

Browse Source 
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
This commit is contained in:
commy2 2016-09-24 22:31:10 +02:00 committed by GitHub
parent 9451716a44
commit e7bc2e9d62
64 changed files with 0 additions and 881 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/atragmx/config.cpp
View File

@ -18,7 +18,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "RscTitles.hpp" #include "RscTitles.hpp"
class ACE_newEvents {
RangerfinderData = QEGVAR(vector,rangefinderData);
};

4
addons/attach/config.cpp
View File

@ -19,7 +19,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "GUI_VirtualAmmo.hpp" #include "GUI_VirtualAmmo.hpp"
class ACE_newEvents {
interactMenuOpened = "ace_interactMenuOpened";
};

4
addons/backpacks/config.cpp
View File

@ -15,7 +15,3 @@ class CfgPatches {
}; };
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
class ACE_newEvents {
backpackOpened = "ace_backpackOpened";
};

8
addons/captives/config.cpp
View File

@ -20,11 +20,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "CfgEden.hpp" #include "CfgEden.hpp"
class ACE_newEvents {
SetSurrendered = QGVAR(setSurrendered);
SetHandcuffed = QGVAR(setHandcuffed);
MoveOutCaptive = QGVAR(moveOutCaptive);
MoveInCaptive = QGVAR(moveInCaptive);
CaptiveStatusChanged = "ace_captiveStatusChanged";
};

10
addons/cargo/config.cpp
View File

@ -18,13 +18,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "menu.hpp" #include "menu.hpp"
class ACE_newEvents {
LoadCargo = "ace_loadCargo";
cargoUnloaded = "ace_cargoUnloaded";
cargoLoaded = "ace_cargoLoaded";
AddCargoByClass = "ace_addCargo";
ServerUnloadCargo = QGVAR(serverUnload);
UnloadCargo = "ace_unloadCargo";
cargoAddedByClass = "ace_cargoAdded";
};

29
addons/common/XEH_PREP.hpp
View File

@ -38,7 +38,6 @@ PREP(dropBackpack);
PREP(endRadioTransmission); PREP(endRadioTransmission);
PREP(eraseCache); PREP(eraseCache);
PREP(errorMessage); PREP(errorMessage);
PREP(execNextFrame);
PREP(findUnloadPosition); PREP(findUnloadPosition);
PREP(firedEH); PREP(firedEH);
PREP(fixCollision); PREP(fixCollision);
@ -85,12 +84,10 @@ PREP(hadamardProduct);
PREP(handleEngine); PREP(handleEngine);
PREP(handleModifierKey); PREP(handleModifierKey);
PREP(handleModifierKeyUp); PREP(handleModifierKeyUp);
PREP(handleScrollWheel);
PREP(hasItem); PREP(hasItem);
PREP(hasMagazine); PREP(hasMagazine);
PREP(headBugFix); PREP(headBugFix);
PREP(hideUnit); PREP(hideUnit);
PREP(insertionSort);
PREP(interpolateFromArray); PREP(interpolateFromArray);
PREP(inTransitionAnim); PREP(inTransitionAnim);
PREP(isAwake); PREP(isAwake);
@ -173,8 +170,6 @@ PREP(unmuteUnit);
PREP(useItem); PREP(useItem);
PREP(useMagazine); PREP(useMagazine);
PREP(watchVariable); PREP(watchVariable);
PREP(waitAndExecute);
PREP(waitUntilAndExecute);
PREP(waveHeightAt); PREP(waveHeightAt);
PREP(translateToWeaponSpace); PREP(translateToWeaponSpace);
@ -184,14 +179,12 @@ PREP(translateToModelSpace);
PREP(worldToScreenBounds); PREP(worldToScreenBounds);
// config items // config items
PREP(getConfigType);
PREP(getItemType); PREP(getItemType);
PREP(getWeaponType); PREP(getWeaponType);
PREP(getWeaponModes); PREP(getWeaponModes);
PREP(getWeaponMuzzles); PREP(getWeaponMuzzles);
// config objects // config objects
PREP(getConfigTypeObject);
PREP(getConfigGunner); PREP(getConfigGunner);
PREP(getConfigCommander); PREP(getConfigCommander);
PREP(getSelectionsWithoutHitPoints); PREP(getSelectionsWithoutHitPoints);
@ -212,10 +205,6 @@ PREP(getTurretsFFV);
PREP(getTurretsOther); PREP(getTurretsOther);
PREP(hasHatch); PREP(hasHatch);
// missing inventory commands
PREP(binocularMagazine);
PREP(removeBinocularMagazine);
// ACE_Debug // ACE_Debug
PREP(getChildren); PREP(getChildren);
PREP(getDisplayConfigName); PREP(getDisplayConfigName);
@ -225,15 +214,6 @@ PREP(showUser);
PREP(dumpPerformanceCounters); PREP(dumpPerformanceCounters);
PREP(dumpArray); PREP(dumpArray);
PREP(globalEvent);
PREP(addEventHandler);
PREP(objectEvent);
PREP(targetEvent);
PREP(serverEvent);
PREP(localEvent);
PREP(removeEventHandler);
PREP(removeAlLEventHandlers);
// Synchronized Events // Synchronized Events
PREP(syncedEventPFH); PREP(syncedEventPFH);
PREP(addSyncedEventHandler); PREP(addSyncedEventHandler);
@ -248,17 +228,8 @@ PREP(_handleRequestAllSyncedEvents);
// other eventhandlers // other eventhandlers
PREP(addActionEventHandler); PREP(addActionEventHandler);
PREP(addActionMenuEventHandler); PREP(addActionMenuEventHandler);
PREP(addScrollWheelEventHandler);
PREP(addMapMarkerCreatedEventHandler); PREP(addMapMarkerCreatedEventHandler);
PREP(removeActionEventHandler); PREP(removeActionEventHandler);
PREP(removeActionMenuEventHandler); PREP(removeActionMenuEventHandler);
PREP(removeScrollWheelEventHandler);
PREP(removeMapMarkerCreatedEventHandler); PREP(removeMapMarkerCreatedEventHandler);
// hashes
PREP(hashCreate);
PREP(hashSet);
PREP(hashGet);
PREP(hashHasKey);
PREP(hashRem);

1
addons/common/XEH_missionDisplayLoad.sqf
View File

@ -1,4 +1,3 @@
#include "script_component.hpp" #include "script_component.hpp"
call COMPILE_FILE(init_handleScrollWheel);
call COMPILE_FILE(init_handleModifierKey); call COMPILE_FILE(init_handleModifierKey);

65
addons/common/XEH_postInit.sqf
View File

@ -306,71 +306,6 @@ if (!isNull (missionNamespace getVariable ["cba_events_oldUnit", objNull])) then
// "playerChanged" event // "playerChanged" event
["unit", { ["unit", {
ACE_player = (_this select 0); ACE_player = (_this select 0);
["ace_playerChanged", _this] call CBA_fnc_localEvent;
}] call CBA_fnc_addPlayerEventHandler;
// "playerVehicleChanged" event
["vehicle", {
["ace_playerVehicleChanged", _this] call CBA_fnc_localEvent;
}] call CBA_fnc_addPlayerEventHandler;
// "playerTurretChanged" event
["turret", {
["ace_playerTurretChanged", _this] call CBA_fnc_localEvent;
}] call CBA_fnc_addPlayerEventHandler;
// "playerWeaponChanged" event
["weapon", {
["ace_playerWeaponChanged", _this] call CBA_fnc_localEvent;
}] call CBA_fnc_addPlayerEventHandler;
// "playerInventoryChanged" event
["loadout", {
private _fnc_getAllGear = {
if (isNull _this) exitWith {[
"",
"",
"", [],
"", [],
"", [],
"", ["","","",""], [],
"", ["","","",""], [],
"", ["","","",""], [],
[],
"",
""
]};
[
headgear _this,
goggles _this,
uniform _this, uniformItems _this,
vest _this, vestItems _this,
backpack _this, backpackItems _this,
primaryWeapon _this, primaryWeaponItems _this, primaryWeaponMagazine _this,
secondaryWeapon _this, secondaryWeaponItems _this, secondaryWeaponMagazine _this,
handgunWeapon _this, handgunItems _this, handgunMagazine _this,
assignedItems _this,
binocular _this,
_this call CBA_fnc_binocularMagazine
]
};
["ace_playerInventoryChanged", [ACE_player, ACE_player call _fnc_getAllGear]] call CBA_fnc_localEvent;
}] call CBA_fnc_addPlayerEventHandler;
// "playerVisionModeChanged" event
["visionMode", {
["ace_playerVisionModeChanged", _this] call CBA_fnc_localEvent;
}] call CBA_fnc_addPlayerEventHandler;
// "cameraViewChanged" event
["cameraView", {
["ace_cameraViewChanged", _this] call CBA_fnc_localEvent;
}] call CBA_fnc_addPlayerEventHandler;
["visibleMap", {
["ace_visibleMapChanged", _this] call CBA_fnc_localEvent;
}] call CBA_fnc_addPlayerEventHandler; }] call CBA_fnc_addPlayerEventHandler;
GVAR(OldIsCamera) = false; GVAR(OldIsCamera) = false;

64
addons/common/config.cpp
View File

@ -14,70 +14,6 @@ class CfgPatches {
}; };
}; };
// This class will be deprecated in version 3.8.0
class ACE_newEvents {
// Status effect events
forceWalk = QGVAR(forceWalk);
blockSprint = QGVAR(blockSprint);
setCaptive = QGVAR(setCaptive);
blockDamage = QGVAR(blockDamage);
blockEngine = QGVAR(blockEngine);
// Public listenable events
PlayerJip = "ace_playerJIP";
activeCameraChanged = "ace_activeCameraChanged";
visibleMapChanged = "ace_visibleMapChanged";
cameraViewChanged = "ace_cameraViewChanged";
playerVisionModeChanged = "ace_playerVisionModeChanged";
playerInventoryChanged = "ace_playerInventoryChanged";
playerWeaponChanged = "ace_playerWeaponChanged";
playerTurretChanged = "ace_playerTurretChanged";
playerVehicleChanged = "ace_playerVehicleChanged";
playerChanged = "ace_playerChanged";
SettingsInitialized = "ace_settingsInitialized";
SettingChanged = "ace_settingChanged";
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
firedPlayerVehicle = "ace_firedPlayerVehicle";
firedNonPlayer = "ace_firedNonPlayer";
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
unloadPersonEvent = "ace_unloadPersonEvent";
loadPersonEvent = "ace_loadPersonEvent";
useItem = "ace_useItem";
infoDisplayChanged = "ace_infoDisplayChanged";
// Internal callable events
setStatusEffect = QGVAR(setStatusEffect);
HeadbugFixUsed = QGVAR(headbugFixUsed);
InitSettingsFromModules = QGVAR(initSettingsFromModules);
enableSimulationGlobal = QGVAR(enableSimulationGlobal);
hideObjectGlobal = QGVAR(hideObjectGlobal);
fixPosition = QGVAR(fixPosition);
fixFloating = QGVAR(fixFloating);
fixCollision = QGVAR(fixCollision);
unlockVehicle = QGVAR(unlockVehicle);
lockVehicle = QGVAR(lockVehicle);
displayTextPicture = QGVAR(displayTextPicture);
displayTextStructured = QGVAR(displayTextStructured);
setVanillaHitPointDamage = QGVAR(setVanillaHitPointDamage);
setVectorDirAndUp = QGVAR(setVectorDirAndUp);
switchMove = QGVAR(switchMove);
playMoveNow = QGVAR(playMoveNow);
playMove = QGVAR(playMove);
setVelocity = QGVAR(setVelocity);
selectLeader = QGVAR(selectLeader);
setSpeaker = QGVAR(setSpeaker);
engineOn = QGVAR(engineOn);
setFuel = QGVAR(setFuel);
setDir = QGVAR(setDir);
// Events framework
SEH_s = "ACEs";
SEH = "ACEe";
SEH_all = "ACEa";
};
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgLocationTypes.hpp" #include "CfgLocationTypes.hpp"

14
addons/common/functions/fnc_addEventHandler.sqf
View File

@ -1,14 +0,0 @@
#define DEBUG_MODE_FULL
#include "script_component.hpp"
params ["_eventName", "_eventCode"];
private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
if (_newName != "") then {
TRACE_2("Switching Names",_eventName,_newName);
_eventName = _newName;
};
[_eventName, _eventCode] call CBA_fnc_addEventHandler;
ACE_DEPRECATED("ace_common_fnc_addEventHandler","3.8.0","CBA_fnc_addEventHandler");

35
addons/common/functions/fnc_addScrollWheelEventHandler.sqf
View File

@ -1,35 +0,0 @@
/*
* Author: commy2
* Add an event handler that executes every time the scroll wheel is used. This is needed, because adding a MouseZ display event handler to display 46 will break in save games.
* _this will be [Interval] where 'Interval' is a number.
*
* Arguments:
* 0: Code to execute <CODE, STRING>
*
* Return Value:
* ID of the event script (used to remove it later). <NUMBER>
*
* Public: Yes
*/
#include "script_component.hpp"
params ["_statement"];
ACE_DEPRECATED("ace_common_fnc_addScrollWheelEventHandler", "3.8.0", "'MouseZChanged' Display EventHandler");
if (_statement isEqualType "") then {
_statement = compile _statement;
};
private _actionsVar = missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]];
_actionsVar params ["_id", "_actionIDs", "_actions"];
_id = _id + 1;
_actionIDs pushBack _id;
_actions pushBack _statement;
missionNamespace setVariable ["ACE_EventHandler_ScrollWheel", [_id, _actionIDs, _actions]];
_id

20
addons/common/functions/fnc_binocularMagazine.sqf
View File

@ -1,20 +0,0 @@
/*
* Author: commy2
* Returns the magazine of the units rangefinder.
*
* Arguments:
* 0: Unit <OBJECT>
*
* Return Value:
* Magazine of the units binocular <STRING>
*
* Example:
* player call ace_common_fnc_binocularMagazine
*
* Public: Yes
*/
#include "script_component.hpp"
ACE_DEPRECATED("ace_common_fnc_binocularMagazine","3.8.0","CBA_fnc_binocularMagazine");
_this call CBA_fnc_binocularMagazine

18
addons/common/functions/fnc_execNextFrame.sqf
View File

@ -1,18 +0,0 @@
/*
* Author: esteldunedain
* Executes a code on the next frame
*
* Arguments:
* 0: Code to execute <CODE>
* 1: Parameters to run the code with <ARRAY>
*
* Return Value:
* PFH handler ID <NUMBER>
*
* Public: Yes
*/
#include "script_component.hpp"
ACE_DEPRECATED("ace_common_fnc_execNextFrame","3.8.0","CBA_fnc_execNextFrame");
_this call CBA_fnc_execNextFrame;

17
addons/common/functions/fnc_getConfigType.sqf
View File

@ -1,17 +0,0 @@
/*
* Author: commy2
* Determins type of item. Can be CfgMagaines, CfgWeapons or CfgGlasses.
*
* Arguments:
* 0: Item Classname <STRING>
*
* Return Value:
* Config category ("CfgWeapons", "CfgMagazines", "CfgGlasses", "") <STRING>
*
* Public: Yes
*/
#include "script_component.hpp"
ACE_DEPRECATED("ace_common_fnc_getConfigType","3.8.0","CBA_fnc_getItemConfig");
configName (configHierarchy (_item call CBA_fnc_getItemConfig) param [1, configNull])

17
addons/common/functions/fnc_getConfigTypeObject.sqf
View File

@ -1,17 +0,0 @@
/*
* Author: commy2
* Determins type of object. Can be CfgVehicles or CfgAmmo.
*
* Arguments:
* 0: Object classname <STRING>
*
* Return Value:
* Config category ("CfgWeapons", "Cfgmagazines", "CfgGlasses", "") <STRING>
*
* Public: Yes
*/
#include "script_component.hpp"
ACE_DEPRECATED("ace_common_fnc_getConfigTypeObject","3.8.0","CBA_fnc_getObjectConfig");
configName (configHierarchy (_item call CBA_fnc_getObjectConfig) param [1, configNull])

14
addons/common/functions/fnc_globalEvent.sqf
View File

@ -1,14 +0,0 @@
#define DEBUG_MODE_FULL
#include "script_component.hpp"
params ["_eventName", "_eventArgs"];
private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
if (_newName != "") then {
TRACE_2("Switching Names",_eventName,_newName);
_eventName = _newName;
};
[_eventName, _eventArgs] call CBA_fnc_globalEvent;
ACE_DEPRECATED("ace_common_fnc_globalEvent","3.8.0","CBA_fnc_globalEvent");

20
addons/common/functions/fnc_handleScrollWheel.sqf
View File

@ -1,20 +0,0 @@
/*
* Author: commy2
* Handles MouseZChanged event.
*
* Arguments:
* None
*
* Return Value:
* None
*
* Public : No
*/
#include "script_component.hpp"
{
[_this select 1] call _x;
false
} count ((missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]]) select 2);
nil

17
addons/common/functions/fnc_hashCreate.sqf
View File

@ -1,17 +0,0 @@
/*
* Author: ?
* Returns an empty hash structure
*
* Arguments:
* None
*
* Return Value:
* Empty Hash Structure <ARRAY>
*
* Public: No
*/
#include "script_component.hpp"
ACE_DEPRECATED(QFUNC(hashCreate),"3.8.0","CBA_fnc_hashCreate");
[[],[]]

40
addons/common/functions/fnc_hashGet.sqf
View File

@ -1,40 +0,0 @@
/*
* Author: ?
* Returns value attached to key in given hash.
*
* Arguments:
* 0: Hash <ARRAY>
* 1: Key <STRING>
*
* Return Value:
* Value <ANY>
*
* Public: No
*/
#include "script_component.hpp"
ACE_DEPRECATED(QFUNC(hashGet),"3.8.0","CBA_fnc_hashGet");
params ["_hash", "_key"];
ERRORDATA(2);
private _val = nil;
try {
if(VALIDHASH(_hash)) then {
private _index = (_hash select 0) find _key;
if(_index != -1) then {
_val = (_hash select 1) select _index;
if(IS_STRING(_val) && {_val == "ACREHASHREMOVEDONOTUSETHISVAL"}) then {
_val = nil;
};
};
} else {
ERROR("Input hash is not valid");
};
} catch {
HANDLECATCH;
};
if (isNil "_val") exitWith { nil };
_val

35
addons/common/functions/fnc_hashHasKey.sqf
View File

@ -1,35 +0,0 @@
/*
* Author: ?
* ?
*
* Arguments:
* ?
*
* Return Value:
* ?
*
* Public: ?
*/
#include "script_component.hpp"
ACE_DEPRECATED(QFUNC(hashHasKey),"3.8.0","CBA_fnc_hashHasKey");
// diag_log text format["%1 HASH HAS KEY: %2", diag_tickTime, _this];
params ["_hash", "_key"];
ERRORDATA(2);
private _val = false;
try {
if(VALIDHASH(_hash)) then {
private _index = (_hash select 0) find _key;
if(_index != -1) then {
_val = true;
};
} else {
ERROR("Input hash is not valid");
};
} catch {
HANDLECATCH;
};
_val

41
addons/common/functions/fnc_hashRem.sqf
View File

@ -1,41 +0,0 @@
/*
* Author: ?
* ?
*
* Arguments:
* ?
*
* Return Value:
* ?
*
* Public: ?
*/
#include "script_component.hpp"
ACE_DEPRECATED(QFUNC(hashRem),"3.8.0","CBA_fnc_hashRem");
params ["_hash", "_key"];
ERRORDATA(2);
private _val = nil;
try {
if(VALIDHASH(_hash)) then {
private _index = (_hash select 0) find _key;
if(_index != -1) then {
(_hash select 1) set[_index, "ACREHASHREMOVEDONOTUSETHISVAL"];
// is this hash is not part of a hash list?
// if it is we need to leave the keys intact.
if((count _hash) == 2) then {
// if this is a standalone hash then we can clean it up
(_hash select 0) set[_index, "ACREHASHREMOVEDONOTUSETHISVAL"];
_hash set[0, ((_hash select 0) - ["ACREHASHREMOVEDONOTUSETHISVAL"])];
_hash set[1, ((_hash select 1) - ["ACREHASHREMOVEDONOTUSETHISVAL"])];
};
};
} else {
ERROR("Input hash is not valid");
};
} catch {
HANDLECATCH;
};
true

38
addons/common/functions/fnc_hashSet.sqf
View File

@ -1,38 +0,0 @@
/*
* Author: ?
* ?
*
* Arguments:
* ?
*
* Return Value:
* ?
*
* Public: ?
*/
#include "script_component.hpp"
ACE_DEPRECATED(QFUNC(hashSet),"3.8.0","CBA_fnc_hashSet");
// diag_log text format["%1 HASH SET: %2", diag_tickTime, _this];
params ["_hash", "_key", "_val"];
ERRORDATA(3);
try {
if(VALIDHASH(_hash)) then {
private _index = (_hash select 0) find _key;
if(_index == -1) then {
_index = (_hash select 0) find "ACREHASHREMOVEDONOTUSETHISVAL";
if(_index == -1) then {
_index = (count (_hash select 0));
};
(_hash select 0) set[_index, _key];
};
(_hash select 1) set[_index, _val];
} else {
ERROR("Input hash is not valid");
};
} catch {
HANDLECATCH;
};

22
addons/common/functions/fnc_insertionSort.sqf
View File

@ -1,22 +0,0 @@
/*
* Author: Ruthberg
* Sorts an array of numbers
*
* Arguments:
* 0: array <ARRAY>
* 1: ascending (optional) <BOOL>
*
* Return Value:
* sortedArray (ARRAY)
*
* Public: No
*/
#include "script_component.hpp"
ACE_DEPRECATED(QFUNC(insertionSort),"3.8.0","sort");
params [["_list", [], [[]]], ["_ascending", true, [false]]];
_list = + _list; // copy array to not alter the original one
_list sort _ascending;
_list

13
addons/common/functions/fnc_localEvent.sqf
View File

@ -1,13 +0,0 @@
#include "script_component.hpp"
params ["_eventName", "_eventArgs"];
private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
if (_newName != "") then {
TRACE_2("Switching Names",_eventName,_newName);
_eventName = _newName;
};
[_eventName, _eventArgs] call CBA_fnc_localEvent;
ACE_DEPRECATED("ace_common_fnc_localEvent","3.8.0","CBA_fnc_localEvent");

13
addons/common/functions/fnc_objectEvent.sqf
View File

@ -1,13 +0,0 @@
#include "script_component.hpp"
params ["_eventName", "_eventTargets", "_eventArgs"];
private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
if (_newName != "") then {
TRACE_2("Switching Names",_eventName,_newName);
_eventName = _newName;
};
[_eventName, _eventArgs, _eventTargets] call CBA_fnc_targetEvent;
ACE_DEPRECATED("ace_common_fnc_objectEvent","3.8.0","CBA_fnc_targetEvent");

14
addons/common/functions/fnc_removeAllEventHandlers.sqf
View File

@ -1,14 +0,0 @@
#include "script_component.hpp"
params ["_eventName"];
private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
if (_newName != "") then {
TRACE_2("Switching Names",_eventName,_newName);
_eventName = _newName;
};
CBA_events_eventNamespace setVariable [_eventName,nil];
CBA_events_eventHashes setVariable [_eventName,nil];
ACE_DEPRECATED("ace_common_fnc_removeAllEventHandlers","3.8.0","N/A (remove events individually w/ CBA_fnc_removeEventHandler)");

20
addons/common/functions/fnc_removeBinocularMagazine.sqf
View File

@ -1,20 +0,0 @@
/*
* Author: commy2
* Removes the magazine of the units rangefinder.
*
* Arguments:
* 0: Unit <OBJECT>
*
* Return Value:
* None
*
* Example:
* player call ace_common_fnc_removeBinocularMagazine
*
* Public: Yes
*/
#include "script_component.hpp"
ACE_DEPRECATED("ace_common_fnc_removeBinocularMagazine","3.8.0","CBA_fnc_removeBinocularMagazine");
_this call CBA_fnc_removeBinocularMagazine

13
addons/common/functions/fnc_removeEventHandler.sqf
View File

@ -1,13 +0,0 @@
#include "script_component.hpp"
params ["_eventName", "_eventCode"];
private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
if (_newName != "") then {
TRACE_2("Switching Names",_eventName,_newName);
_eventName = _newName;
};
[_eventName, _eventCode] call CBA_fnc_removeEventHandler;
ACE_DEPRECATED("ace_common_fnc_removeEventHandler","3.8.0","CBA_fnc_removeEventHandler");

31
addons/common/functions/fnc_removeScrollWheelEventHandler.sqf
View File

@ -1,31 +0,0 @@
/*
* Author: commy2
* Remove a scroll wheel event handler.
*
* Arguments:
* 0: ID of the event handler <NUMBER>
*
* Return Value:
* None
*
* Public: Yes
*/
#include "script_component.hpp"
params ["_id"];
private _actionsVar = missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]];
_actionsVar params ["_currentId", "_actionIDs", "_actions"];
_id = _actionIDs find _id;
if (_id == -1) exitWith {};
_actionIDs set [_id, -1];
_actionIDs = _actionIDs - [-1];
_actions set [_id, []];//{}
_actions = _actions - [[]];//[{}]
missionNamespace setVariable ["ACE_EventHandler_ScrollWheel", [_currentId, _actionIDs, _actions]];

13
addons/common/functions/fnc_serverEvent.sqf
View File

@ -1,13 +0,0 @@
#include "script_component.hpp"
params ["_eventName", "_eventArgs"];
private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
if (_newName != "") then {
TRACE_2("Switching Names",_eventName,_newName);
_eventName = _newName;
};
[_eventName, _eventArgs] call CBA_fnc_serverEvent;
ACE_DEPRECATED("ace_common_fnc_serverEvent","3.8.0","CBA_fnc_serverEvent");

13
addons/common/functions/fnc_targetEvent.sqf
View File

@ -1,13 +0,0 @@
#include "script_component.hpp"
params ["_eventName", "_eventTargets", "_eventArgs"];
private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
if (_newName != "") then {
TRACE_2("Switching Names",_eventName,_newName);
_eventName = _newName;
};
[_eventName,_eventArgs,_eventTargets] call CBA_fnc_targetEvent;
ACE_DEPRECATED("ace_common_fnc_targetEvent","3.8.0","CBA_fnc_targetEvent");

22
addons/common/functions/fnc_waitAndExecute.sqf
View File

@ -1,22 +0,0 @@
/*
* Author: esteldunedain
* Executes a code once with a given game time delay, using a PFH
*
* Arguments:
* 0: Code to execute <CODE>
* 1: Parameters to run the code with <ARRAY>
* 2: Delay in seconds before executing the code <NUMBER>
*
* Return Value:
* None
*
* Example:
* [{(_this select 0) setVelocity [0,0,200];}, [player], 10] call ace_common_fnc_waitAndExecute
*
* Public: Yes
*/
#include "script_component.hpp"
ACE_DEPRECATED("ace_common_fnc_waitAndExecute","3.8.0","CBA_fnc_waitAndExecute");
_this call CBA_fnc_waitAndExecute;

24
addons/common/functions/fnc_waitUntilAndExecute.sqf
View File

@ -1,24 +0,0 @@
/*
* Author: joko // Jonas
* Executes a code once with after the Condition is True, using a PFH
*
* Arguments:
* 0: Condition <CODE>
* 1: Code to execute <CODE>
* 2: Parameters to run the code with <ARRAY,ANY,NIL>
*
* Return Value:
* None
*
* Example:
* [{(_this select 0) == vehicle (_this select 0)}, {(_this select 0) setDamage 1;}, [ACE_player]] call ace_common_fnc_waitUntilAndExecute
*
* Public: No
*/
#include "script_component.hpp"
ACE_DEPRECATED("ace_common_fnc_waitUntilAndExecute","3.8.0","CBA_fnc_waitUntilAndExecute");
_this call CBA_fnc_waitUntilAndExecute;
nil

19
addons/common/init_handleScrollWheel.sqf
View File

@ -1,19 +0,0 @@
/*
* Author: commy2
* Initializes the MouseZChanged eventhandler.
*
* Arguments:
* None
*
* Return Value:
* None
*
* Public : No
*/
#include "script_component.hpp"
disableSerialization;
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", QUOTE(_this call FUNC(handleScrollWheel))];

4
addons/concertina_wire/config.cpp
View File

@ -16,7 +16,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
class ACE_newEvents {
interactMenuOpened = "ace_interactMenuOpened";
};

4
addons/dagr/config.cpp
View File

@ -19,7 +19,3 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "Dialog.hpp" #include "Dialog.hpp"
#include "RscTitles.hpp" #include "RscTitles.hpp"
class ACE_newEvents {
RangerfinderData = QEGVAR(vector,rangefinderData);
};

5
addons/disarming/config.cpp
View File

@ -19,8 +19,3 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "gui_disarm.hpp" #include "gui_disarm.hpp"
class ACE_newEvents {
DisarmDebugCallback = QGVAR(debugCallback);
DisarmDropItems = QGVAR(dropItems);
};

5
addons/explosives/config.cpp
View File

@ -45,8 +45,3 @@ class CfgMineTriggers {
mineTriggerRange = 1; mineTriggerRange = 1;
}; };
}; };
class ACE_newEvents {
clientRequestsOrientations = QGVAR(sendOrientations);
serverSendsOrientations = QGVAR(orientationsSent);
};

5
addons/goggles/config.cpp
View File

@ -270,8 +270,3 @@ class CfgCloudlets {
destroyOnWaterSurface = 1; destroyOnWaterSurface = 1;
}; };
}; };
class ACE_newEvents {
GlassesChanged = "ace_glassesChanged";
GlassesCracked = "ace_glassesCracked";
};

4
addons/grenades/config.cpp
View File

@ -28,7 +28,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "Effects.hpp" #include "Effects.hpp"
class ACE_newEvents {
flashbangExplosion = "ace_flashbangExploded";
};

6
addons/interact_menu/config.cpp
View File

@ -25,9 +25,3 @@ class CfgPatches {
class ACE_Extensions { class ACE_Extensions {
extensions[] += {"ace_break_line", "ace_parse_imagepath"}; extensions[] += {"ace_break_line", "ace_parse_imagepath"};
}; };
class ACE_newEvents {
interactMenuOpened = "ace_interactMenuOpened";
clearConditionCaches = QGVAR(clearConditionCaches);
interactMenuClosed = "ace_interactMenuClosed";
};

9
addons/interaction/config.cpp
View File

@ -19,12 +19,3 @@ class CfgPatches {
#include "RscTitles.hpp" #include "RscTitles.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
#include "ACE_ZeusActions.hpp" #include "ACE_ZeusActions.hpp"
class ACE_newEvents {
getDown = QGVAR(getDown);
pardon = QGVAR(pardon);
tapShoulder = QGVAR(tapShoulder);
sendAway = QGVAR(sendAway);
lampTurnOff = QGVAR(setLampOff);
lampTurnOn = QGVAR(setLampOn);
};

5
addons/laser/config.cpp
View File

@ -17,8 +17,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "RscInGameUI.hpp" #include "RscInGameUI.hpp"
class ACE_newEvents {
laser_laserOff = "ace_laserOff";
laser_laserOn = "ace_laserOn";
};

5
addons/laserpointer/config.cpp
View File

@ -19,8 +19,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "CfgJointRails.hpp" #include "CfgJointRails.hpp"
class ACE_newEvents {
GunLightOff = "ace_gunLightOff";
SetHandcuffed = QEGVAR(captives,setHandcuffed);
};

4
addons/logistics_wirecutter/config.cpp
View File

@ -17,7 +17,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
class ACE_newEvents {
interactMenuOpened = "ace_interactMenuOpened";
};

4
addons/microdagr/config.cpp
View File

@ -19,7 +19,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "gui.hpp" #include "gui.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
class ACE_newEvents {
RangerfinderData = QEGVAR(vector,rangefinderData);
};

4
addons/mk6mortar/config.cpp
View File

@ -34,7 +34,3 @@ class RscStructuredText;
#include "RscInGameUI.hpp" #include "RscInGameUI.hpp"
#include "RscRangeTable.hpp" #include "RscRangeTable.hpp"
class ACE_newEvents {
initMortar = "ace_initMortar";
};

7
addons/overheating/config.cpp
View File

@ -52,10 +52,3 @@ class CfgGesturesMale {
}; };
}; };
}; };
class ACE_newEvents {
initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted);
showWeaponTemperature = QGVAR(showWeaponTemperature);
loadCoolestSpareBarrel = QGVAR(loadCoolestSpareBarrel);
sendSpareBarrelTemperatureHint = QGVAR(sendSpareBarrelTemperatureHint);
weaponJammed = "ace_weaponJammed";
};

4
addons/overpressure/config.cpp
View File

@ -16,7 +16,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents {
overpressure = "ace_overpressure";
};

6
addons/reload/config.cpp
View File

@ -20,9 +20,3 @@ class CfgPatches {
#include "CfgActions.hpp" #include "CfgActions.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
#include "ACE_UI.hpp" #include "ACE_UI.hpp"
class ACE_newEvents {
setAmmoSync = QGVAR(syncAmmo);
returnedAmmo = QGVAR(ammoReturned);
linkedAmmo = QGVAR(ammoLinked);
};

4
addons/reloadlaunchers/config.cpp
View File

@ -18,7 +18,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents {
reloadLauncher = QGVAR(reloadLauncher);
};

7
addons/repair/config.cpp
View File

@ -20,10 +20,3 @@ class CfgPatches {
#include "CfgActions.hpp" #include "CfgActions.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgEden.hpp" #include "CfgEden.hpp"
class ACE_newEvents {
setWheelHitPointDamage = QGVAR(setWheelHitPointDamage);
setVehicleHitPointDamage = QGVAR(setVehicleHitPointDamage);
setVehicleDamage = QGVAR(setVehicleDamage);
AddCargoByClass = "ace_addCargo";
};

6
addons/repair/functions/fnc_setHitPointDamage.sqf
View File

@ -26,12 +26,6 @@ private ["_damageNew", "_damageOld", "_hitPointDamageRepaired", "_hitPointDamage
// can't execute all commands if the vehicle isn't local. exit here. // can't execute all commands if the vehicle isn't local. exit here.
if !(local _vehicle) exitWith {ACE_LOGERROR_1("Vehicle Not Local %1", _vehicle);}; if !(local _vehicle) exitWith {ACE_LOGERROR_1("Vehicle Not Local %1", _vehicle);};
//Check for bad typeName (changed from orignal v3.3 that took string)
if (_hitPointIndex isEqualType "") then {
ACE_DEPRECATED("repair-setHitPointDamage (hit point name <string>","3.5.0","hit index <number>");
_hitPointIndex = _allHitPoints find _hitPointIndex;
};
// get all hitpoints and selections and damages // get all hitpoints and selections and damages
(getAllHitPointsDamage _vehicle) params [["_allHitPoints", []], ["_allHitPointsSelections", []], ["_allHitPointDamages", []]]; (getAllHitPointsDamage _vehicle) params [["_allHitPoints", []], ["_allHitPointsSelections", []], ["_allHitPointDamages", []]];

5
addons/respawn/config.cpp
View File

@ -19,8 +19,3 @@ class CfgPatches {
#include "CfgVehicleClasses.hpp" #include "CfgVehicleClasses.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
class ACE_newEvents {
rallypointMoved = "ace_rallypointMoved";
killedByFriendly = "ace_killedByFriendly";
};

4
addons/sandbag/config.cpp
View File

@ -17,7 +17,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents {
interactMenuOpened = "ace_interactMenuOpened";
};

4
addons/sitting/config.cpp
View File

@ -18,7 +18,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgMoves.hpp" #include "CfgMoves.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
class ACE_newEvents {
SetHandcuffed = QEGVAR(captives,setHandcuffed);
};

5
addons/spectator/config.cpp
View File

@ -25,8 +25,3 @@ class CfgRespawnTemplates {
onPlayerRespawn = QFUNC(respawnTemplate); onPlayerRespawn = QFUNC(respawnTemplate);
}; };
}; };
class ACE_newEvents {
spectatorStaged = "ace_spectatorStaged";
spectatorSet = "ace_spectatorSet";
};

4
addons/tacticalladder/config.cpp
View File

@ -16,7 +16,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
class ACE_newEvents {
interactMenuOpened = "ace_interactMenuOpened";
};

5
addons/tagging/config.cpp
View File

@ -19,8 +19,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents {
createTag = QGVAR(createTag);
tagCreated = "ace_tagCreated";
};

4
addons/trenches/config.cpp
View File

@ -17,7 +17,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents {
interactMenuOpened = "ace_interactMenuOpened";
};

4
addons/tripod/config.cpp
View File

@ -17,7 +17,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents {
interactMenuOpened = "ace_interactMenuOpened";
};

4
addons/vector/config.cpp
View File

@ -20,7 +20,3 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "RscInGameUI.hpp" #include "RscInGameUI.hpp"
class ACE_newEvents {
RangerfinderData = QGVAR(rangefinderData);
};

5
addons/vehiclelock/config.cpp
View File

@ -20,8 +20,3 @@ class CfgPatches {
#include "CfgMagazines.hpp" #include "CfgMagazines.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents {
VehicleLock_SetVehicleLock = QGVAR(setVehicleLock);
VehicleLock_SetupCustomKey = QGVAR(setupCustomKey);
};

7
addons/zeus/config.cpp
View File

@ -53,10 +53,3 @@ class ACE_Curator {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
#include "ui\RscAttributes.hpp" #include "ui\RscAttributes.hpp"
class ACE_newEvents {
zeusUnitAssigned = QGVAR(zeusUnitAssigned);
SetSurrendered = QEGVAR(captives,setSurrendered);
SetHandcuffed = QEGVAR(captives,setHandcuffed);
AddCargoByClass = "ace_addCargo";
};