mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
remove obsolete custom eh from agm
This commit is contained in:
parent
cefd8d5c54
commit
1b8a9290cd
@ -8,7 +8,6 @@ PREP(addActionEventHandler);
|
|||||||
PREP(addActionMenuEventHandler);
|
PREP(addActionMenuEventHandler);
|
||||||
PREP(addCameraEventHandler);
|
PREP(addCameraEventHandler);
|
||||||
PREP(addCanInteractWithCondition);
|
PREP(addCanInteractWithCondition);
|
||||||
PREP(addCustomEventHandler);
|
|
||||||
PREP(addLineToDebugDraw);
|
PREP(addLineToDebugDraw);
|
||||||
PREP(addMapMarkerCreatedEventHandler);
|
PREP(addMapMarkerCreatedEventHandler);
|
||||||
PREP(addScrollWheelEventHandler);
|
PREP(addScrollWheelEventHandler);
|
||||||
@ -21,8 +20,6 @@ PREP(beingCarried);
|
|||||||
PREP(binarizeNumber);
|
PREP(binarizeNumber);
|
||||||
PREP(blurScreen);
|
PREP(blurScreen);
|
||||||
PREP(cachedCall);
|
PREP(cachedCall);
|
||||||
PREP(callCustomEventHandlers);
|
|
||||||
PREP(callCustomEventHandlersGlobal);
|
|
||||||
PREP(canGetInPosition);
|
PREP(canGetInPosition);
|
||||||
PREP(canInteract);
|
PREP(canInteract);
|
||||||
PREP(canInteractWith);
|
PREP(canInteractWith);
|
||||||
@ -152,7 +149,6 @@ PREP(removeActionEventHandler);
|
|||||||
PREP(removeActionMenuEventHandler);
|
PREP(removeActionMenuEventHandler);
|
||||||
PREP(removeCameraEventHandler);
|
PREP(removeCameraEventHandler);
|
||||||
PREP(removeCanInteractWithCondition);
|
PREP(removeCanInteractWithCondition);
|
||||||
PREP(removeCustomEventHandler);
|
|
||||||
PREP(removeMapMarkerCreatedEventHandler);
|
PREP(removeMapMarkerCreatedEventHandler);
|
||||||
PREP(removeScrollWheelEventHandler);
|
PREP(removeScrollWheelEventHandler);
|
||||||
PREP(removeSpecificMagazine);
|
PREP(removeSpecificMagazine);
|
||||||
@ -258,8 +254,6 @@ if (hasInterface) then {
|
|||||||
ACE_player = missionNamespace getVariable ["BIS_fnc_moduleRemoteControl_unit", player];
|
ACE_player = missionNamespace getVariable ["BIS_fnc_moduleRemoteControl_unit", player];
|
||||||
uiNamespace setVariable ["ACE_player", ACE_player];
|
uiNamespace setVariable ["ACE_player", ACE_player];
|
||||||
|
|
||||||
// Raise custom event. @todo, remove
|
|
||||||
[missionNamespace, "playerChanged", [ACE_player, _oldPlayer]] call FUNC(callCustomEventHandlers);
|
|
||||||
// Raise ACE event
|
// Raise ACE event
|
||||||
["playerChanged", [ACE_player, _oldPlayer]] call FUNC(localEvent);
|
["playerChanged", [ACE_player, _oldPlayer]] call FUNC(localEvent);
|
||||||
};
|
};
|
||||||
|
@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* Author: commy2
|
|
||||||
*
|
|
||||||
* Add a custom event to a unit. The event scripts are called by FUNC(callCustomEventHandlers).
|
|
||||||
*
|
|
||||||
* Argument:
|
|
||||||
* 0: Object the event should be assigned to or namespace (Object OR Namespace)
|
|
||||||
* 1: Name of the event (String)
|
|
||||||
* 2: Code to execute (Code or String)
|
|
||||||
*
|
|
||||||
* Return value:
|
|
||||||
* ID of the event script (used to remove it later).
|
|
||||||
*/
|
|
||||||
#include "script_component.hpp"
|
|
||||||
|
|
||||||
private ["_object", "_type", "_statement", "_name", "_actionsVar", "_id", "_actionIDs", "_actions"];
|
|
||||||
|
|
||||||
_object = _this select 0;
|
|
||||||
_type = _this select 1;
|
|
||||||
_statement = _this select 2;
|
|
||||||
|
|
||||||
if (typeName _statement == "STRING") then {
|
|
||||||
_statement = compile _statement;
|
|
||||||
};
|
|
||||||
|
|
||||||
_name = format ["ACE_CustomEventHandlers_%1", _type];
|
|
||||||
|
|
||||||
_actionsVar = _object getVariable [_name, [-1, [], []]];
|
|
||||||
|
|
||||||
_id = (_actionsVar select 0) + 1;
|
|
||||||
_actionIDs = _actionsVar select 1;
|
|
||||||
_actions = _actionsVar select 2;
|
|
||||||
|
|
||||||
_actionIDs pushBack _id;
|
|
||||||
_actions pushBack _statement;
|
|
||||||
|
|
||||||
_object setVariable [_name, [_id, _actionIDs, _actions]];
|
|
||||||
|
|
||||||
_id
|
|
@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
* Author: commy2
|
|
||||||
*
|
|
||||||
* Execute all custom event script assigned to this object.
|
|
||||||
*
|
|
||||||
* Argument:
|
|
||||||
* 0: Object the eventhandlers are assigned to or namespace (Object or Namespace)
|
|
||||||
* 1: Name of the event (String)
|
|
||||||
* 2: Arguments passed to the eventhandler script (Array, optional default: [Object the event handlers are assigned to])
|
|
||||||
*
|
|
||||||
* Return value:
|
|
||||||
* None.
|
|
||||||
*/
|
|
||||||
#include "script_component.hpp"
|
|
||||||
|
|
||||||
private ["_object", "_type", "_argument", "_name", "_actions"];
|
|
||||||
|
|
||||||
_object = _this select 0;
|
|
||||||
_type = _this select 1;
|
|
||||||
_argument = _this select 2;
|
|
||||||
|
|
||||||
if (isNil "_argument") then {_argument = [_object]};
|
|
||||||
|
|
||||||
_name = format ["ACE_CustomEventHandlers_%1", _type];
|
|
||||||
|
|
||||||
_actions = (_object getVariable [_name, [-1, [], []]]) select 2;
|
|
||||||
|
|
||||||
{
|
|
||||||
_argument call _x; nil;
|
|
||||||
} count _actions;
|
|
||||||
nil
|
|
@ -1,16 +0,0 @@
|
|||||||
/*
|
|
||||||
* Author: commy2
|
|
||||||
*
|
|
||||||
* Execute all custom event script assigned to this object on every machine.
|
|
||||||
*
|
|
||||||
* Argument:
|
|
||||||
* 0: Object the eventhandlers are assigned to or namespace (Object or Namespace)
|
|
||||||
* 1: Name of the event (String)
|
|
||||||
* 2: Arguments passed to the eventhandler script (Array, optional default: [Object the event handlers are assigned to])
|
|
||||||
*
|
|
||||||
* Return value:
|
|
||||||
* None.
|
|
||||||
*/
|
|
||||||
#include "script_component.hpp"
|
|
||||||
|
|
||||||
[_this, QUOTE(FUNC(callCustomEventHandlers)), 2] call FUNC(execRemoteFnc);
|
|
@ -1,40 +0,0 @@
|
|||||||
/*
|
|
||||||
* Author: commy2
|
|
||||||
*
|
|
||||||
* Remove a custom event handler from an object.
|
|
||||||
*
|
|
||||||
* Argument:
|
|
||||||
* 0: Unit the event handler is assigned to or namespace (Object OR Namespace)
|
|
||||||
* 1: Name of the event (String)
|
|
||||||
* 2: ID of the event handler (Number)
|
|
||||||
*
|
|
||||||
* Return value:
|
|
||||||
* None.
|
|
||||||
*/
|
|
||||||
#include "script_component.hpp"
|
|
||||||
|
|
||||||
private ["_object", "_type", "_id", "_name", "_actionsVar", "_currentId", "_actionIDs", "_actions"];
|
|
||||||
|
|
||||||
_object = _this select 0;
|
|
||||||
_type = _this select 1;
|
|
||||||
_id = _this select 2;
|
|
||||||
|
|
||||||
_name = format ["ACE_CustomEventHandlers_%1", _type];
|
|
||||||
|
|
||||||
_actionsVar = _object getVariable [_name, [-1, [], []]];
|
|
||||||
|
|
||||||
_currentId = _actionsVar select 0;
|
|
||||||
_actionIDs = _actionsVar select 1;
|
|
||||||
_actions = _actionsVar select 2;
|
|
||||||
|
|
||||||
_id = _actionIDs find _id;
|
|
||||||
|
|
||||||
if (_id == -1) exitWith {};
|
|
||||||
|
|
||||||
_actionIDs set [_id, -1];
|
|
||||||
_actionIDs = _actionIDs - [-1];
|
|
||||||
|
|
||||||
_actions set [_id, []];//{}
|
|
||||||
_actions = _actions - [[]];//[{}]
|
|
||||||
|
|
||||||
_object setVariable [_name, [_currentId, _actionIDs, _actions]];
|
|
@ -25,8 +25,6 @@ _killer = _this select 1;
|
|||||||
if (_unit != _killer && side group _unit in [side group ACE_player, civilian] && {side group _killer == side group ACE_player}) then {
|
if (_unit != _killer && side group _unit in [side group ACE_player, civilian] && {side group _killer == side group ACE_player}) then {
|
||||||
systemChat format ["%1 was killed by %2", [_unit] call EFUNC(common,getName), [_killer] call EFUNC(common,getName)];
|
systemChat format ["%1 was killed by %2", [_unit] call EFUNC(common,getName), [_killer] call EFUNC(common,getName)];
|
||||||
|
|
||||||
// Raise custom event. @todo: remove
|
|
||||||
[_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(common,callCustomEventHandlers);
|
|
||||||
// Raise ACE globalEvent
|
// Raise ACE globalEvent
|
||||||
["killedByFriendly", [_unit, _killer]] call EFUNC(common,globalEvent);
|
["killedByFriendly", [_unit, _killer]] call EFUNC(common,globalEvent);
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user