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

Update common event names to meet new standard

Browse Source
This commit is contained in:
SilentSpike 2016-06-04 11:12:56 +01:00
parent 1b6bbff139
commit 90ebf9638b
80 changed files with 117 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/advanced_ballistics/config.cpp
View File

@ -21,8 +21,3 @@ class CfgPatches {
class ACE_Extensions { class ACE_Extensions {
extensions[] += {"ace_advanced_ballistics"}; extensions[] += {"ace_advanced_ballistics"};
}; };
class ACE_newEvents {
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
};

1
addons/captives/config.cpp
View File

@ -21,7 +21,6 @@ class CfgPatches {
#include "CfgEden.hpp" #include "CfgEden.hpp"
class ACE_newEvents { class ACE_newEvents {
medical_onUnconscious = "ace_unconscious";
SetSurrendered = QGVAR(setSurrendered); SetSurrendered = QGVAR(setSurrendered);
SetHandcuffed = QGVAR(setHandcuffed); SetHandcuffed = QGVAR(setHandcuffed);
MoveOutCaptive = QGVAR(moveOutCaptive); MoveOutCaptive = QGVAR(moveOutCaptive);

2
addons/captives/functions/fnc_handleOnUnconscious.sqf
View File

@ -1,6 +1,6 @@
/* /*
* Author: commy2, PabstMirror * Author: commy2, PabstMirror
* Handles the "medical_onUnconscious" event * Handles the "ace_unconscious" event
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit <OBJECT>

4
addons/cargo/XEH_postInit.sqf
View File

@ -13,7 +13,7 @@
private _itemName = getText (configFile >> "CfgVehicles" >> typeOf _item >> "displayName"); private _itemName = getText (configFile >> "CfgVehicles" >> typeOf _item >> "displayName");
private _vehicleName = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "displayName"); private _vehicleName = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "displayName");
["ace_displayTextStructured", [[_hint, _itemName, _vehicleName], 3.0]] call CBA_fnc_localEvent; [[_hint, _itemName, _vehicleName], 3.0] call EFUNC(common,displayTextStructured);
if (_loaded) then { if (_loaded) then {
// Invoke listenable event // Invoke listenable event
@ -34,7 +34,7 @@
private _itemName = getText (configFile >> "CfgVehicles" >> _itemClass >> "displayName"); private _itemName = getText (configFile >> "CfgVehicles" >> _itemClass >> "displayName");
private _vehicleName = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "displayName"); private _vehicleName = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "displayName");
["ace_displayTextStructured", [[_hint, _itemName, _vehicleName], 3.0]] call CBA_fnc_localEvent; [[_hint, _itemName, _vehicleName], 3.0] call EFUNC(common,displayTextStructured);
if (_unloaded) then { if (_unloaded) then {
// Invoke listenable event // Invoke listenable event

1
addons/cargo/config.cpp
View File

@ -21,7 +21,6 @@ class CfgPatches {
class ACE_newEvents { class ACE_newEvents {
LoadCargo = "ace_loadCargo"; LoadCargo = "ace_loadCargo";
cargoUnloaded = "ace_cargoUnloaded"; cargoUnloaded = "ace_cargoUnloaded";
displayTextStructured = "ace_displayTextStructured";
cargoLoaded = "ace_cargoLoaded"; cargoLoaded = "ace_cargoLoaded";
AddCargoByClass = "ace_addCargoByClass"; AddCargoByClass = "ace_addCargoByClass";
ServerUnloadCargo = QGVAR(serverUnload); ServerUnloadCargo = QGVAR(serverUnload);

2
addons/cargo/functions/fnc_startLoadIn.sqf
View File

@ -48,7 +48,7 @@ if ([_object, _vehicle] call FUNC(canLoadItemIn)) then {
} else { } else {
private _displayName = getText (configFile >> "CfgVehicles" >> typeOf _object >> "displayName"); private _displayName = getText (configFile >> "CfgVehicles" >> typeOf _object >> "displayName");
["ace_displayTextStructured", [[LSTRING(LoadingFailed), _displayName], 3.0]] call CBA_fnc_localEvent; [[LSTRING(LoadingFailed), _displayName], 3.0] call EFUNC(common,displayTextStructured);
}; };
_return _return

2
addons/cargo/functions/fnc_startUnload.sqf
View File

@ -47,5 +47,5 @@ if ([_item, GVAR(interactionVehicle), ACE_player] call FUNC(canUnloadItem)) then
private _itemClass = if (_item isEqualType "") then {_item} else {typeOf _item}; private _itemClass = if (_item isEqualType "") then {_item} else {typeOf _item};
private _displayName = getText (configFile >> "CfgVehicles" >> _itemClass >> "displayName"); private _displayName = getText (configFile >> "CfgVehicles" >> _itemClass >> "displayName");
["ace_displayTextStructured", [[LSTRING(UnloadingFailed), _displayName], 3.0]] call CBA_fnc_localEvent; [[LSTRING(UnloadingFailed), _displayName], 3.0] call EFUNC(common,displayTextStructured);
}; };

2
addons/cargo/functions/fnc_unloadItem.sqf
View File

@ -29,7 +29,7 @@ if ((count _emptyPosAGL) != 3) exitWith {
TRACE_4("Could not find unload pos",_vehicle,getPosASL _vehicle,isTouchingGround _vehicle,speed _vehicle); TRACE_4("Could not find unload pos",_vehicle,getPosASL _vehicle,isTouchingGround _vehicle,speed _vehicle);
if ((!isNull _unloader) && {_unloader == ACE_player}) then { if ((!isNull _unloader) && {_unloader == ACE_player}) then {
//display text saying there are no safe places to exit the vehicle //display text saying there are no safe places to exit the vehicle
["ace_displayTextStructured", [localize ELSTRING(common,NoRoomToUnload)]] call CBA_fnc_localEvent; [localize ELSTRING(common,NoRoomToUnload)] call EFUNC(common,displayTextStructured);
}; };
false false
}; };

40
addons/common/XEH_postInit.sqf
View File

@ -75,7 +75,7 @@ if (isServer) then {
}; };
// Listens for global "SettingChanged" events, to update the force status locally // Listens for global "SettingChanged" events, to update the force status locally
["SettingChanged", { ["ace_settingChanged", {
params ["_name", "_value", "_force"]; params ["_name", "_value", "_force"];
if (_force) then { if (_force) then {
@ -94,33 +94,33 @@ if (isServer) then {
ACE_LOGINFO_2("Headbug Used: Name: %1, Animation: %2",_profileName,_animation); ACE_LOGINFO_2("Headbug Used: Name: %1, Animation: %2",_profileName,_animation);
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
["ace_fixCollision", FUNC(fixCollision)] call CBA_fnc_addEventHandler; [QGVAR(fixCollision), FUNC(fixCollision)] call CBA_fnc_addEventHandler;
["ace_fixFloating", FUNC(fixFloating)] call CBA_fnc_addEventHandler; [QGVAR(fixFloating), FUNC(fixFloating)] call CBA_fnc_addEventHandler;
["ace_fixPosition", FUNC(fixPosition)] call CBA_fnc_addEventHandler; [QGVAR(fixPosition), FUNC(fixPosition)] call CBA_fnc_addEventHandler;
["ace_loadPersonEvent", FUNC(loadPersonLocal)] call CBA_fnc_addEventHandler; ["ace_loadPersonEvent", FUNC(loadPersonLocal)] call CBA_fnc_addEventHandler;
["ace_unloadPersonEvent", FUNC(unloadPersonLocal)] call CBA_fnc_addEventHandler; ["ace_unloadPersonEvent", FUNC(unloadPersonLocal)] call CBA_fnc_addEventHandler;
["lockVehicle", { [QGVAR(lockVehicle), {
_this setVariable [QGVAR(lockStatus), locked _this]; _this setVariable [QGVAR(lockStatus), locked _this];
_this lock 2; _this lock 2;
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
["unlockVehicle", { [QGVAR(unlockVehicle), {
_this lock (_this getVariable [QGVAR(lockStatus), locked _this]); _this lock (_this getVariable [QGVAR(lockStatus), locked _this]);
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
["ace_setDir", {(_this select 0) setDir (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(setDir), {(_this select 0) setDir (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_setFuel", {(_this select 0) setFuel (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(setFuel), {(_this select 0) setFuel (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_engineOn", {(_this select 0) engineOn (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(engineOn), {(_this select 0) engineOn (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_setSpeaker", {(_this select 0) setSpeaker (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(setSpeaker), {(_this select 0) setSpeaker (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_selectLeader", {(_this select 0) selectLeader (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(selectLeader), {(_this select 0) selectLeader (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_setVelocity", {(_this select 0) setVelocity (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(setVelocity), {(_this select 0) setVelocity (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_playMove", {(_this select 0) playMove (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(playMove), {(_this select 0) playMove (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_playMoveNow", {(_this select 0) playMoveNow (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(playMoveNow), {(_this select 0) playMoveNow (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_switchMove", {(_this select 0) switchMove (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(switchMove), {(_this select 0) switchMove (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_setVectorDirAndUp", {(_this select 0) setVectorDirAndUp (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(setVectorDirAndUp), {(_this select 0) setVectorDirAndUp (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_setVanillaHitPointDamage", {(_this select 0) setHitPointDamage (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(setVanillaHitPointDamage), {(_this select 0) setHitPointDamage (_this select 1)}] call CBA_fnc_addEventHandler;
// Request framework // Request framework
[QGVAR(requestCallback), FUNC(requestCallback)] call CBA_fnc_addEventHandler; [QGVAR(requestCallback), FUNC(requestCallback)] call CBA_fnc_addEventHandler;
@ -426,10 +426,10 @@ GVAR(OldIsCamera) = false;
// Eventhandlers for player controlled machines // Eventhandlers for player controlled machines
////////////////////////////////////////////////// //////////////////////////////////////////////////
["ace_displayTextStructured", {_this call FUNC(displayTextStructured)}] call CBA_fnc_addEventHandler; [QGVAR(displayTextStructured), {_this call FUNC(displayTextStructured)}] call CBA_fnc_addEventHandler;
["ace_displayTextPicture", {_this call FUNC(displayTextPicture)}] call CBA_fnc_addEventHandler; [QGVAR(displayTextPicture), {_this call FUNC(displayTextPicture)}] call CBA_fnc_addEventHandler;
["medical_onUnconscious", { ["ace_unconscious", {
params ["_unit", "_isUnconscious"]; params ["_unit", "_isUnconscious"];
if (local _unit && {!_isUnconscious}) then { if (local _unit && {!_isUnconscious}) then {

59
addons/common/config.cpp
View File

@ -15,12 +15,14 @@ class CfgPatches {
// This class will be deprecated in version 3.8.0 // This class will be deprecated in version 3.8.0
class ACE_newEvents { class ACE_newEvents {
// Status effect events
forceWalk = QGVAR(forceWalk); forceWalk = QGVAR(forceWalk);
blockSprint = QGVAR(blockSprint); blockSprint = QGVAR(blockSprint);
setCaptive = QGVAR(setCaptive); setCaptive = QGVAR(setCaptive);
blockDamage = QGVAR(blockDamage); blockDamage = QGVAR(blockDamage);
blockEngine = QGVAR(blockEngine); blockEngine = QGVAR(blockEngine);
// Public listenable events
PlayerJip = "ace_playerJIP"; PlayerJip = "ace_playerJIP";
activeCameraChanged = "ace_activeCameraChanged"; activeCameraChanged = "ace_activeCameraChanged";
visibleMapChanged = "ace_visibleMapChanged"; visibleMapChanged = "ace_visibleMapChanged";
@ -32,32 +34,6 @@ class ACE_newEvents {
playerVehicleChanged = "ace_playerVehicleChanged"; playerVehicleChanged = "ace_playerVehicleChanged";
playerChanged = "ace_playerChanged"; playerChanged = "ace_playerChanged";
SettingsInitialized = "ace_settingsInitialized"; SettingsInitialized = "ace_settingsInitialized";
setStatusEffect = QGVAR(setStatusEffect);
HeadbugFixUsed = QGVAR(headbugFixUsed);
InitSettingsFromModules = QGVAR(initSettingsFromModules);
enableSimulationGlobal = QGVAR(enableSimulationGlobal);
hideObjectGlobal = QGVAR(hideObjectGlobal);
useItem = "ace_useItem";
displayTextPicture = "ace_displayTextPicture";
displayTextStructured = "ace_displayTextStructured";
setVanillaHitPointDamage = "ace_setVanillaHitPointDamage";
setVectorDirAndUp = "ace_setVectorDirAndUp";
switchMove = "ace_switchMove";
playMoveNow = "ace_playMoveNow";
playMove = "ace_playMove";
setVelocity = "ace_setVelocity";
selectLeader = "ace_selectLeader";
setSpeaker = "ace_setSpeaker";
engineOn = "ace_engineOn";
setFuel = "ace_setFuel";
setDir = "ace_setDir";
unloadPersonEvent = "ace_unloadPersonEvent";
loadPersonEvent = "ace_loadPersonEvent";
fixPosition = "ace_fixPosition";
fixFloating = "ace_fixFloating";
fixCollision = "ace_fixCollision";
SettingChanged = "ace_settingChanged"; SettingChanged = "ace_settingChanged";
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle"; firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal"; firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
@ -65,8 +41,35 @@ class ACE_newEvents {
firedNonPlayer = "ace_firedNonPlayer"; firedNonPlayer = "ace_firedNonPlayer";
firedPlayerNonLocal = "ace_firedPlayerNonLocal"; firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer"; firedPlayer = "ace_firedPlayer";
unlockVehicle = "ace_unlockVehicle"; unloadPersonEvent = "ace_unloadPersonEvent";
lockVehicle = "ace_lockVehicle"; 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);
}; };
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"

4
addons/common/functions/fnc_claim.sqf
View File

@ -28,9 +28,9 @@ _target setVariable [QGVAR(owner), _unit, true];
// lock target object // lock target object
if (_lockTarget) then { if (_lockTarget) then {
if (!isNull _unit) then { if (!isNull _unit) then {
["ace_lockVehicle", _target, _target] call CBA_fnc_targetEvent; [QGVAR(lockVehicle), _target, _target] call CBA_fnc_targetEvent;
} else { } else {
["ace_unlockVehicle", _target, _target] call CBA_fnc_targetEvent; [QGVAR(unlockVehicle), _target, _target] call CBA_fnc_targetEvent;
}; };
}; };

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

@ -41,34 +41,34 @@ TRACE_2("",local _unit,vehicle _unit);
switch (_priority) do { switch (_priority) do {
case 0: { case 0: {
if (_unit == vehicle _unit) then { if (_unit == vehicle _unit) then {
["ace_playMove", [_unit, _animation], _unit] call CBA_fnc_targetEvent; [QGVAR(playMove), [_unit, _animation], _unit] call CBA_fnc_targetEvent;
} else { } else {
// Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles. // Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles.
["ace_playMove", [_unit, _animation]] call CBA_fnc_globalEvent; [QGVAR(playMove), [_unit, _animation]] call CBA_fnc_globalEvent;
}; };
}; };
case 1: { case 1: {
if (_unit == vehicle _unit) then { if (_unit == vehicle _unit) then {
["ace_playMoveNow", [_unit, _animation], _unit] call CBA_fnc_targetEvent; [QGVAR(playMoveNow), [_unit, _animation], _unit] call CBA_fnc_targetEvent;
} else { } else {
// Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles. // Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles.
["ace_playMoveNow", [_unit, _animation]] call CBA_fnc_globalEvent; [QGVAR(playMoveNow), [_unit, _animation]] call CBA_fnc_globalEvent;
}; };
}; };
case 2: { case 2: {
// try playMoveNow first // try playMoveNow first
if (_unit == vehicle _unit) then { if (_unit == vehicle _unit) then {
["ace_playMoveNow", [_unit, _animation], _unit] call CBA_fnc_targetEvent; [QGVAR(playMoveNow), [_unit, _animation], _unit] call CBA_fnc_targetEvent;
} else { } else {
// Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles. // Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles.
["ace_playMoveNow", [_unit, _animation]] call CBA_fnc_globalEvent; [QGVAR(playMoveNow), [_unit, _animation]] call CBA_fnc_globalEvent;
}; };
// if animation doesn't respond, do switchMove // if animation doesn't respond, do switchMove
if (animationState _unit != _animation) then { if (animationState _unit != _animation) then {
TRACE_1("did not respond to playMoveNow",animationState _unit); TRACE_1("did not respond to playMoveNow",animationState _unit);
// Execute on all machines. SwitchMove has local effects. // Execute on all machines. SwitchMove has local effects.
["ace_switchMove", [_unit, _animation]] call CBA_fnc_globalEvent; [QGVAR(switchMove), [_unit, _animation]] call CBA_fnc_globalEvent;
}; };
}; };
default {}; default {};

2
addons/common/functions/fnc_muteUnit.sqf
View File

@ -29,6 +29,6 @@ private _speaker = speaker _unit;
if (_speaker == "ACE_NoVoice") exitWith {}; if (_speaker == "ACE_NoVoice") exitWith {};
["ace_setSpeaker", [_unit, "ACE_NoVoice"]] call CBA_fnc_globalEvent; [QGVAR(setSpeaker), [_unit, "ACE_NoVoice"]] call CBA_fnc_globalEvent;
_unit setVariable ["ACE_OriginalSpeaker", _speaker, true]; _unit setVariable ["ACE_OriginalSpeaker", _speaker, true];

2
addons/common/functions/fnc_muteUnitHandleInitPost.sqf
View File

@ -16,5 +16,5 @@ params ["_unit"];
// setSpeaker gets overwritten after init on remote units; if unit is muted, setSpeaker again // setSpeaker gets overwritten after init on remote units; if unit is muted, setSpeaker again
if (count (_unit getVariable [QGVAR(muteUnitReasons), []]) > 0) then { if (count (_unit getVariable [QGVAR(muteUnitReasons), []]) > 0) then {
["ace_setSpeaker", [_unit, "ACE_NoVoice"]] call CBA_fnc_localEvent; [QGVAR(setSpeaker), [_unit, "ACE_NoVoice"]] call CBA_fnc_localEvent;
}; };

2
addons/common/functions/fnc_muteUnitHandleRespawn.sqf
View File

@ -18,4 +18,4 @@ params ["_unit"];
_unit setVariable [QGVAR(muteUnitReasons), _unit getVariable [QGVAR(muteUnitReasons), []], true]; _unit setVariable [QGVAR(muteUnitReasons), _unit getVariable [QGVAR(muteUnitReasons), []], true];
// fix mp issues with respawning and the speaker // fix mp issues with respawning and the speaker
["ace_setSpeaker", [_unit, speaker _unit]] call CBA_fnc_globalEvent; [QGVAR(setSpeaker), [_unit, speaker _unit]] call CBA_fnc_globalEvent;

2
addons/common/functions/fnc_unloadPersonLocal.sqf
View File

@ -27,7 +27,7 @@ if (count _emptyPos != 3) exitwith {
ACE_LOGWARNING_4("Could not find unload pos %1-ASL: %2 isTouchingGround: %3 Speed: %4",_vehicle, getPosASL _vehicle, isTouchingGround _vehicle, speed _vehicle); ACE_LOGWARNING_4("Could not find unload pos %1-ASL: %2 isTouchingGround: %3 Speed: %4",_vehicle, getPosASL _vehicle, isTouchingGround _vehicle, speed _vehicle);
if ((!isNull _unloader) && {[_unloader] call FUNC(isPlayer)}) then { if ((!isNull _unloader) && {[_unloader] call FUNC(isPlayer)}) then {
//display text saying there are no safe places to exit the vehicle //display text saying there are no safe places to exit the vehicle
["ace_displayTextStructured", [localize LSTRING(NoRoomToUnload)], [_unloader]] call CBA_fnc_targetEvent; [QGVAR(displayTextStructured), [localize LSTRING(NoRoomToUnload)], [_unloader]] call CBA_fnc_targetEvent;
}; };
false false
}; };

2
addons/common/functions/fnc_unmuteUnit.sqf
View File

@ -32,4 +32,4 @@ private _speaker = _unit getVariable ["ACE_OriginalSpeaker", ""];
if (_speaker == "") exitWith {}; if (_speaker == "") exitWith {};
["ace_setSpeaker", [_unit, _speaker], _unit] call CBA_fnc_targetEvent; [QGVAR(setSpeaker), [_unit, _speaker], _unit] call CBA_fnc_targetEvent;

5
addons/disposable/config.cpp
View File

@ -17,8 +17,3 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "CfgMagazines.hpp" #include "CfgMagazines.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
class ACE_newEvents {
firedNonPlayer = "ace_firedNonPlayer";
firedPlayer = "ace_firedPlayer";
};

8
addons/dragging/config.cpp
View File

@ -16,11 +16,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgMovesBasic.hpp" #include "CfgMovesBasic.hpp"
class ACE_newEvents {
medical_onUnconscious = "ace_unconscious";
setDir = "ace_setDir";
fixFloating = "ace_fixFloating";
fixPosition = "ace_fixPosition";
fixCollision = "ace_fixCollision";
};

2
addons/dragging/functions/fnc_carryObject.sqf
View File

@ -44,7 +44,7 @@ if (_target isKindOf "CAManBase") then {
_target attachTo [_unit, _position]; _target attachTo [_unit, _position];
}; };
["ace_setDir", [_target, _direction], _target] call CBA_fnc_targetEvent; [QEGVAR(common,setDir), [_target, _direction], _target] call CBA_fnc_targetEvent;
_unit setVariable [QGVAR(isCarrying), true, true]; _unit setVariable [QGVAR(isCarrying), true, true];
_unit setVariable [QGVAR(carriedObject), _target, true]; _unit setVariable [QGVAR(carriedObject), _target, true];

2
addons/dragging/functions/fnc_dragObject.sqf
View File

@ -33,7 +33,7 @@ _position = _position vectorAdd [0, 0, _offset];
// attach object // attach object
TRACE_3("attaching",_position,_offset,_direction); TRACE_3("attaching",_position,_offset,_direction);
_target attachTo [_unit, _position]; _target attachTo [_unit, _position];
["ace_setDir", [_target, _direction], _target] call CBA_fnc_targetEvent; [QEGVAR(common,setDir), [_target, _direction], _target] call CBA_fnc_targetEvent;
if (_target isKindOf "CAManBase") then { if (_target isKindOf "CAManBase") then {
[_target, "AinjPpneMrunSnonWnonDb_still", 0, true] call EFUNC(common,doAnimation); [_target, "AinjPpneMrunSnonWnonDb_still", 0, true] call EFUNC(common,doAnimation);

8
addons/dragging/functions/fnc_dropObject.sqf
View File

@ -30,8 +30,8 @@ if !(_unit getVariable ["ACE_isUnconscious", false]) then {
}; };
// prevent collision damage // prevent collision damage
["ace_fixCollision", _unit] call CBA_fnc_localEvent; [QEGVAR(common,fixCollision), _unit] call CBA_fnc_localEvent;
["ace_fixCollision", _target, _target] call CBA_fnc_targetEvent; [QEGVAR(common,fixCollision), _target, _target] call CBA_fnc_targetEvent;
// release object // release object
detach _target; detach _target;
@ -62,8 +62,8 @@ _unit setVariable [QGVAR(draggedObject), objNull, true];
[objNull, _target, true] call EFUNC(common,claim); [objNull, _target, true] call EFUNC(common,claim);
if !(_target isKindOf "CAManBase") then { if !(_target isKindOf "CAManBase") then {
["ace_fixPosition", _target, _target] call CBA_fnc_targetEvent; [QEGVAR(common,fixPosition), _target, _target] call CBA_fnc_targetEvent;
["ace_fixFloating", _target, _target] call CBA_fnc_targetEvent; [QEGVAR(common,fixFloating), _target, _target] call CBA_fnc_targetEvent;
}; };
if (_unit getVariable ["ACE_isUnconscious", false]) then { if (_unit getVariable ["ACE_isUnconscious", false]) then {

8
addons/dragging/functions/fnc_dropObject_carry.sqf
View File

@ -25,8 +25,8 @@ TRACE_2("params",_unit,_target);
private _inBuilding = [_unit] call FUNC(isObjectOnObject); private _inBuilding = [_unit] call FUNC(isObjectOnObject);
// prevent collision damage // prevent collision damage
["ace_fixCollision", _unit] call CBA_fnc_localEvent; [QEGVAR(common,fixCollision), _unit] call CBA_fnc_localEvent;
["ace_fixCollision", _target, _target] call CBA_fnc_targetEvent; [QEGVAR(common,fixCollision), _target, _target] call CBA_fnc_targetEvent;
// release object // release object
detach _target; detach _target;
@ -67,8 +67,8 @@ _unit setVariable [QGVAR(carriedObject), objNull, true];
[objNull, _target, true] call EFUNC(common,claim); [objNull, _target, true] call EFUNC(common,claim);
if !(_target isKindOf "CAManBase") then { if !(_target isKindOf "CAManBase") then {
["ace_fixPosition", _target, _target] call CBA_fnc_targetEvent; [QEGVAR(common,fixPosition), _target, _target] call CBA_fnc_targetEvent;
["ace_fixFloating", _target, _target] call CBA_fnc_targetEvent; [QEGVAR(common,fixFloating), _target, _target] call CBA_fnc_targetEvent;
}; };
// recreate UAV crew // recreate UAV crew

2
addons/dragging/functions/fnc_handleScrollWheel.sqf
View File

@ -42,6 +42,6 @@ _carriedItem attachTo [_unit];
//reset the carry direction //reset the carry direction
private _direction = _carriedItem getVariable [QGVAR(carryDirection), 0]; private _direction = _carriedItem getVariable [QGVAR(carryDirection), 0];
["ace_setDir", [_carriedItem, _direction], _carriedItem] call CBA_fnc_targetEvent; [QEGVAR(common,setDir), [_carriedItem, _direction], _carriedItem] call CBA_fnc_targetEvent;
true true

1
addons/explosives/config.cpp
View File

@ -45,7 +45,6 @@ class CfgMineTriggers {
}; };
class ACE_newEvents { class ACE_newEvents {
medical_onUnconscious = "ace_unconscious";
clientRequestsOrientations = QGVAR(clientRequestOrientations); clientRequestsOrientations = QGVAR(clientRequestOrientations);
serverSendsOrientations = QGVAR(serverSendOrientations); serverSendsOrientations = QGVAR(serverSendOrientations);
}; };

6
addons/fcs/config.cpp
View File

@ -26,9 +26,3 @@ class CfgPatches {
class ACE_Extensions { class ACE_Extensions {
extensions[] += {"ace_fcs"}; extensions[] += {"ace_fcs"};
}; };
class ACE_newEvents {
infoDisplayChanged = "ace_infoDisplayChanged";
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
firedPlayerVehicle = "ace_firedPlayerVehicle";
};

8
addons/frag/config.cpp
View File

@ -15,11 +15,3 @@ class CfgPatches {
#include "CfgEventhandlers.hpp" #include "CfgEventhandlers.hpp"
#include "CfgAmmo.hpp" #include "CfgAmmo.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
class ACE_newEvents {
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
firedPlayerVehicle = "ace_firedPlayerVehicle";
firedNonPlayer = "ace_firedNonPlayer";
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
};

1
addons/goggles/config.cpp
View File

@ -271,7 +271,6 @@ class CfgCloudlets {
}; };
class ACE_newEvents { class ACE_newEvents {
firedPlayer = "ace_firedPlayer";
GlassesChanged = "ace_glassesChanged"; GlassesChanged = "ace_glassesChanged";
GlassesCracked = "ace_glassesCracked"; GlassesCracked = "ace_glassesCracked";
}; };

3
addons/grenades/config.cpp
View File

@ -22,8 +22,5 @@ class CfgPatches {
#include "Effects.hpp" #include "Effects.hpp"
class ACE_newEvents { class ACE_newEvents {
firedNonPlayer = "ace_firedNonPlayer";
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
flashbangExplosion = "ace_flashbangExploded"; flashbangExplosion = "ace_flashbangExploded";
}; };

5
addons/huntir/config.cpp
View File

@ -21,8 +21,3 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "Dialog.hpp" #include "Dialog.hpp"
#include "RscTitles.hpp" #include "RscTitles.hpp"
class ACE_newEvents {
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
};

1
addons/interact_menu/config.cpp
View File

@ -26,7 +26,6 @@ class ACE_Extensions {
}; };
class ACE_newEvents { class ACE_newEvents {
SettingChanged = "ace_settingChanged";
interactMenuOpened = "ace_interactMenuOpened"; interactMenuOpened = "ace_interactMenuOpened";
clearConditionCaches = QGVAR(clearConditionCaches); clearConditionCaches = QGVAR(clearConditionCaches);
interactMenuClosed = "ace_interactMenuClosed"; interactMenuClosed = "ace_interactMenuClosed";

4
addons/interaction/config.cpp
View File

@ -24,10 +24,6 @@ class ACE_newEvents {
pardon = QGVAR(pardon); pardon = QGVAR(pardon);
tapShoulder = QGVAR(tapShoulder); tapShoulder = QGVAR(tapShoulder);
sendAway = QGVAR(sendAway); sendAway = QGVAR(sendAway);
setVelocity = "ace_setVelocity";
displayTextStructured = "ace_displayTextStructured";
CBA_teamColorChanged = "ace_CBA_teamColorChanged";
selectLeader = "ace_selectLeader";
lampTurnOff = QGVAR(lampTurnOff); lampTurnOff = QGVAR(lampTurnOff);
lampTurnOn = QGVAR(lampTurnOn); lampTurnOn = QGVAR(lampTurnOn);
}; };

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

@ -17,4 +17,4 @@
params ["_unit"]; params ["_unit"];
["ace_selectLeader", [group _unit, _unit], units group _unit] call CBA_fnc_targetEvent; [QEGVAR(common,selectLeader), [group _unit, _unit], units group _unit] call CBA_fnc_targetEvent;

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

@ -31,5 +31,5 @@ if (_unit == ACE_player) then {
_message = format [localize LSTRING(JoinedTeam), _team]; _message = format [localize LSTRING(JoinedTeam), _team];
}; };
["ace_displayTextStructured", _message] call CBA_fnc_localEvent; [_message] call EFUNC(common,displayTextStructured);
}; };

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

@ -51,4 +51,4 @@ _target addMagazine [_magToPassClassName, _magToPassAmmoCount];
_playerName = [_player] call EFUNC(common,getName); _playerName = [_player] call EFUNC(common,getName);
_magToPassDisplayName = getText (configFile >> "CfgMagazines" >> _magToPassClassName >> "displayName"); _magToPassDisplayName = getText (configFile >> "CfgMagazines" >> _magToPassClassName >> "displayName");
["ace_displayTextStructured", [[LSTRING(PassMagazineHint), _playerName, _magToPassDisplayName], 1.5, _target], [_target]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [[LSTRING(PassMagazineHint), _playerName, _magToPassDisplayName], 1.5, _target], [_target]] call CBA_fnc_targetEvent;

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

@ -22,4 +22,4 @@ private _newVelocity = vectorDir _unit;
_newVelocity set [2, 0.25]; _newVelocity set [2, 0.25];
_newVelocity = _newVelocity vectorMultiply 2; _newVelocity = _newVelocity vectorMultiply 2;
["ace_setVelocity", [_boat, _newVelocity], [_boat]] call CBA_fnc_targetEvent; [QEGVAR(common,setVelocity), [_boat, _newVelocity], [_boat]] call CBA_fnc_targetEvent;

4
addons/logistics_uavbattery/config.cpp
View File

@ -17,7 +17,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "CfgSounds.hpp" #include "CfgSounds.hpp"
class ACE_newEvents {
setFuel = "ace_setFuel";
};

2
addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf
View File

@ -24,7 +24,7 @@ _onFinish = {
(_this select 0) params ["_caller", "_target"]; (_this select 0) params ["_caller", "_target"];
_caller removeItem "ACE_UAVBattery"; _caller removeItem "ACE_UAVBattery";
playSound3D [QUOTE(PATHTO_R(sounds\exchange_battery.ogg)), objNull, false, getPosASL _caller, 1, 1, 10]; playSound3D [QUOTE(PATHTO_R(sounds\exchange_battery.ogg)), objNull, false, getPosASL _caller, 1, 1, 10];
["ace_setFuel", [_target, 1], [_target]] call CBA_fnc_targetEvent; //setFuel is local [QEGVAR(common,setFuel), [_target, 1], [_target]] call CBA_fnc_targetEvent; //setFuel is local
}; };
_onFailure = { _onFailure = {

2
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
View File

@ -57,7 +57,7 @@ if (_selectionName in ["hand_l","hand_r"] && {[_unit, _selectionName] call FUNC(
_logOutPut = ""; _logOutPut = "";
}; };
["ace_displayTextStructured", [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller], [_caller]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller], [_caller]] call CBA_fnc_targetEvent;
if (_logOutPut != "") then { if (_logOutPut != "") then {
[_target,"activity", LSTRING(Check_Bloodpressure_Log), [[_caller, false, true] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); [_target,"activity", LSTRING(Check_Bloodpressure_Log), [[_caller, false, true] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog);

2
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
View File

@ -49,7 +49,7 @@ if (_selectionName in ["hand_l","hand_r"] && {[_unit, _selectionName] call FUNC(
_logOutPut = LSTRING(Check_Pulse_None); _logOutPut = LSTRING(Check_Pulse_None);
}; };
["ace_displayTextStructured", [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller], [_caller]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller], [_caller]] call CBA_fnc_targetEvent;
if (_logOutPut != "") then { if (_logOutPut != "") then {
[_unit,"activity", LSTRING(Check_Pulse_Log),[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); [_unit,"activity", LSTRING(Check_Pulse_Log),[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog);

2
addons/medical/functions/fnc_actionCheckResponse.sqf
View File

@ -19,7 +19,7 @@ params ["_caller", "_target"];
_output = [LSTRING(Check_Response_Unresponsive), LSTRING(Check_Response_Responsive)] select ([_target] call EFUNC(common,isAwake)); _output = [LSTRING(Check_Response_Unresponsive), LSTRING(Check_Response_Responsive)] select ([_target] call EFUNC(common,isAwake));
["ace_displayTextStructured", [[_output, [_target] call EFUNC(common,getName)], 2, _caller], [_caller]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [[_output, [_target] call EFUNC(common,getName)], 2, _caller], [_caller]] call CBA_fnc_targetEvent;
[_target,"activity",_output, [[_target, false, true] call EFUNC(common,getName)]] call FUNC(addToLog); [_target,"activity",_output, [[_target, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);
[_target,"quick_view",_output, [[_target, false, true] call EFUNC(common,getName)]] call FUNC(addToLog); [_target,"quick_view",_output, [[_target, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);

2
addons/medical/functions/fnc_actionDiagnose.sqf
View File

@ -43,4 +43,4 @@ if (alive _target) then {
}; };
}; };
["ace_displayTextStructured", [_genericMessages, 3.0, _caller], [_caller]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [_genericMessages, 3.0, _caller], [_caller]] call CBA_fnc_targetEvent;

2
addons/medical/functions/fnc_actionLoadUnit.sqf
View File

@ -18,7 +18,7 @@ private "_vehicle";
params ["_caller", "_target"]; params ["_caller", "_target"];
if ([_target] call EFUNC(common,isAwake)) exitWith { if ([_target] call EFUNC(common,isAwake)) exitWith {
["ace_displayTextStructured", [[LSTRING(CanNotLoaded), [_target] call EFUNC(common,getName)], 1.5, _caller], [_caller]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [[LSTRING(CanNotLoaded), [_target] call EFUNC(common,getName)], 1.5, _caller], [_caller]] call CBA_fnc_targetEvent;
}; };
if ([_target] call FUNC(isBeingCarried)) then { if ([_target] call FUNC(isBeingCarried)) then {
[_caller, _target] call EFUNC(dragging,dropObject_carry); [_caller, _target] call EFUNC(dragging,dropObject_carry);

2
addons/medical/functions/fnc_actionRemoveTourniquet.sqf
View File

@ -26,7 +26,7 @@ _tourniquets = _target getVariable [QGVAR(tourniquets), [0,0,0,0,0,0]];
// Check if there is a tourniquet on this bodypart // Check if there is a tourniquet on this bodypart
if ((_tourniquets select _part) == 0) exitWith { if ((_tourniquets select _part) == 0) exitWith {
_output = LSTRING(noTourniquetOnBodyPart); _output = LSTRING(noTourniquetOnBodyPart);
["ace_displayTextStructured", [_output, 1.5, _caller], [_caller]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [_output, 1.5, _caller], [_caller]] call CBA_fnc_targetEvent;
}; };
// Removing the tourniquet // Removing the tourniquet

2
addons/medical/functions/fnc_displayPatientInformation.sqf
View File

@ -42,7 +42,7 @@ if (_show) then {
if (ACE_player distance _target > MAX_DISTANCE) exitwith { if (ACE_player distance _target > MAX_DISTANCE) exitwith {
("ACE_MedicalRscDisplayInformation" call BIS_fnc_rscLayer) cutText ["","PLAIN"]; ("ACE_MedicalRscDisplayInformation" call BIS_fnc_rscLayer) cutText ["","PLAIN"];
[_idPFH] call CBA_fnc_removePerFrameHandler; [_idPFH] call CBA_fnc_removePerFrameHandler;
["ace_displayTextStructured", [[LSTRING(DistanceToFar), [_target] call EFUNC(common,getName)], 1.75, ACE_player], [ACE_player]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [[LSTRING(DistanceToFar), [_target] call EFUNC(common,getName)], 1.75, ACE_player], [ACE_player]] call CBA_fnc_targetEvent;
}; };
disableSerialization; disableSerialization;

2
addons/medical/functions/fnc_treatment.sqf
View File

@ -239,7 +239,7 @@ if (_target != _caller) then {
}; };
if (_displayText != "") then { if (_displayText != "") then {
["ace_displayTextStructured", [[_displayText, [_caller] call EFUNC(common,getName), [_target] call EFUNC(common,getName)], 1.5, _caller], [_caller]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [[_displayText, [_caller] call EFUNC(common,getName), [_target] call EFUNC(common,getName)], 1.5, _caller], [_caller]] call CBA_fnc_targetEvent;
}; };
true; true;

4
addons/medical/functions/fnc_treatmentTourniquet.sqf
View File

@ -28,14 +28,14 @@ if (count _items == 0) exitWith {false};
_part = [_selectionName] call FUNC(selectionNameToNumber); _part = [_selectionName] call FUNC(selectionNameToNumber);
if (_part == 0 || _part == 1) exitWith { if (_part == 0 || _part == 1) exitWith {
// ["ace_displayTextStructured", ["You cannot apply a CAT on this body part!"], [_caller]] call CBA_fnc_targetEvent; // [QEGVAR(common,displayTextStructured), ["You cannot apply a CAT on this body part!"], [_caller]] call CBA_fnc_targetEvent;
false; false;
}; };
_tourniquets = _target getVariable [QGVAR(tourniquets), [0,0,0,0,0,0]]; _tourniquets = _target getVariable [QGVAR(tourniquets), [0,0,0,0,0,0]];
if ((_tourniquets select _part) > 0) exitWith { if ((_tourniquets select _part) > 0) exitWith {
_output = "There is already a tourniquet on this body part!"; // TODO localization _output = "There is already a tourniquet on this body part!"; // TODO localization
["ace_displayTextStructured", [_output, 1.5, _caller], [_caller]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [_output, 1.5, _caller], [_caller]] call CBA_fnc_targetEvent;
false; false;
}; };

2
addons/medical_menu/functions/fnc_onMenuOpen.sqf
View File

@ -81,7 +81,7 @@ GVAR(MenuPFHID) = [{
closeDialog 314412; closeDialog 314412;
//If we failed because of distance check, show UI message: //If we failed because of distance check, show UI message:
if ((ACE_player distance GVAR(INTERACTION_TARGET)) > GVAR(maxRange)) then { if ((ACE_player distance GVAR(INTERACTION_TARGET)) > GVAR(maxRange)) then {
["ace_displayTextStructured", [[ELSTRING(medical,DistanceToFar), [GVAR(INTERACTION_TARGET)] call EFUNC(common,getName)], 2, ACE_player]] call CBA_fnc_localEvent; [[ELSTRING(medical,DistanceToFar), [GVAR(INTERACTION_TARGET)] call EFUNC(common,getName)], 2] call EFUNC(common,displayTextStructured);
}; };
}; };

1
addons/mk6mortar/config.cpp
View File

@ -35,6 +35,5 @@ class RscStructuredText;
#include "RscRangeTable.hpp" #include "RscRangeTable.hpp"
class ACE_newEvents { class ACE_newEvents {
infoDisplayChanged = "ace_infoDisplayChanged";
initMortar = "ace_initMortar"; initMortar = "ace_initMortar";
}; };

5
addons/nightvision/config.cpp
View File

@ -17,8 +17,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
class ACE_newEvents {
firedPlayerVehicle = "ace_firedPlayerVehicle";
firedPlayer = "ace_firedPlayer";
};

5
addons/optics/config.cpp
View File

@ -34,8 +34,3 @@ class CfgPatches {
#include "CfgJointRails.hpp" #include "CfgJointRails.hpp"
#include "CfgPreloadTextures.hpp" #include "CfgPreloadTextures.hpp"
class ACE_newEvents {
infoDisplayChanged = "ace_infoDisplayChanged";
firedPlayer = "ace_firedPlayer";
};

3
addons/overheating/config.cpp
View File

@ -54,10 +54,7 @@ class CfgGesturesMale {
class ACE_newEvents { class ACE_newEvents {
initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted); initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted);
showWeaponTemperature = QGVAR(showWeaponTemperature); showWeaponTemperature = QGVAR(showWeaponTemperature);
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
spareBarrelsLoadCoolest = QGVAR(spareBarrelsLoadCoolest); spareBarrelsLoadCoolest = QGVAR(spareBarrelsLoadCoolest);
spareBarrelsSendTemperatureHint = QGVAR(spareBarrelsSendTemperatureHint); spareBarrelsSendTemperatureHint = QGVAR(spareBarrelsSendTemperatureHint);
displayTextStructured = "ace_displayTextStructured";
weaponJammed = "ace_weaponJammed"; weaponJammed = "ace_weaponJammed";
}; };

2
addons/overheating/functions/fnc_sendSpareBarrelsTemperaturesHint.sqf
View File

@ -73,4 +73,4 @@ if (_countExtremelyHot > 0) then {
}; };
TRACE_1("_output",_output); TRACE_1("_output",_output);
["ace_displayTextStructured", [_output, _size, _player], [_player]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [_output, _size, _player], [_player]] call CBA_fnc_targetEvent;

2
addons/overpressure/config.cpp
View File

@ -17,7 +17,5 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents { class ACE_newEvents {
firedPlayerVehicle = "ace_firedPlayerVehicle";
firedPlayer = "ace_firedPlayer";
overpressure = "ace_overpressure"; overpressure = "ace_overpressure";
}; };

4
addons/parachute/config.cpp
View File

@ -17,7 +17,3 @@ class CfgPatches {
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "RscTitles.hpp" #include "RscTitles.hpp"
class ACE_newEvents {
infoDisplayChanged = "ace_infoDisplayChanged";
};

4
addons/rearm/config.cpp
View File

@ -19,7 +19,3 @@ class CfgPatches {
#include "CfgAmmo.hpp" #include "CfgAmmo.hpp"
#include "CfgMagazines.hpp" #include "CfgMagazines.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
class ACE_newEvents {
medical_onUnconscious = "ace_unconscious";
};

8
addons/rearm/functions/fnc_rearmSuccessLocal.sqf
View File

@ -40,7 +40,7 @@ if (_maxMagazines == 1) then {
if (GVAR(level) == 1) then { if (GVAR(level) == 1) then {
// Fill magazine completely // Fill magazine completely
_target setMagazineTurretAmmo [_magazineClass, _rounds, _turretPath]; _target setMagazineTurretAmmo [_magazineClass, _rounds, _turretPath];
["ace_displayTextStructured", [QEGVAR(common,displayTextStructured),
[ [
[LSTRING(Hint_RearmedTriple), _rounds, [LSTRING(Hint_RearmedTriple), _rounds,
getText(configFile >> "CfgMagazines" >> _magazineClass >> "displayName"), getText(configFile >> "CfgMagazines" >> _magazineClass >> "displayName"),
@ -50,7 +50,7 @@ if (_maxMagazines == 1) then {
} else { } else {
// Fill only at most _numRounds // Fill only at most _numRounds
_target setMagazineTurretAmmo [_magazineClass, ((_target magazineTurretAmmo [_magazineClass, _turretPath]) + _numRounds) min _rounds, _turretPath]; _target setMagazineTurretAmmo [_magazineClass, ((_target magazineTurretAmmo [_magazineClass, _turretPath]) + _numRounds) min _rounds, _turretPath];
["ace_displayTextStructured", [QEGVAR(common,displayTextStructured),
[ [
[LSTRING(Hint_RearmedTriple), _numRounds, [LSTRING(Hint_RearmedTriple), _numRounds,
getText(configFile >> "CfgMagazines" >> _magazineClass >> "displayName"), getText(configFile >> "CfgMagazines" >> _magazineClass >> "displayName"),
@ -77,7 +77,7 @@ if (_maxMagazines == 1) then {
} else { } else {
_target setMagazineTurretAmmo [_magazineClass, _currentRounds + _numRounds, _turretPath]; _target setMagazineTurretAmmo [_magazineClass, _currentRounds + _numRounds, _turretPath];
}; };
["ace_displayTextStructured", [QEGVAR(common,displayTextStructured),
[ [
[LSTRING(Hint_RearmedTriple), _numRounds, [LSTRING(Hint_RearmedTriple), _numRounds,
getText(configFile >> "CfgMagazines" >> _magazineClass >> "displayName"), getText(configFile >> "CfgMagazines" >> _magazineClass >> "displayName"),
@ -91,7 +91,7 @@ if (_maxMagazines == 1) then {
_target addMagazineTurret [_magazineClass, _turretPath]; _target addMagazineTurret [_magazineClass, _turretPath];
_target setMagazineTurretAmmo [_magazineClass, _currentRounds, _turretPath]; _target setMagazineTurretAmmo [_magazineClass, _currentRounds, _turretPath];
}; };
["ace_displayTextStructured", [QEGVAR(common,displayTextStructured),
[ [
[LSTRING(Hint_RearmedTriple), _rounds, [LSTRING(Hint_RearmedTriple), _rounds,
getText(configFile >> "CfgMagazines" >> _magazineClass >> "displayName"), getText(configFile >> "CfgMagazines" >> _magazineClass >> "displayName"),

4
addons/recoil/config.cpp
View File

@ -22,7 +22,3 @@ class CfgCameraShake {
// What does this do, really? It seems like the engine no longer respects it. // What does this do, really? It seems like the engine no longer respects it.
defaultCaliberCoefWeaponFire = 0; defaultCaliberCoefWeaponFire = 0;
}; };
class ACE_newEvents {
firedPlayer = "ace_firedPlayer";
};

7
addons/refuel/config.cpp
View File

@ -16,10 +16,3 @@ class CfgPatches {
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
class ACE_newEvents {
medical_onUnconscious = "ace_unconscious";
setFuel = "ace_setFuel";
setVectorDirAndUp = "ace_setVectorDirAndUp";
displayTextStructured = "ace_displayTextStructured";
};

4
addons/refuel/functions/fnc_checkFuel.sqf
View File

@ -27,9 +27,9 @@ private _fuel = [_target] call FUNC(getFuel);
params ["_args"]; params ["_args"];
_args params [["_unit", objNull, [objNull]], ["_target", objNull, [objNull]], ["_fuel", 0, [0]]]; _args params [["_unit", objNull, [objNull]], ["_target", objNull, [objNull]], ["_fuel", 0, [0]]];
if (_fuel > 0 ) then { if (_fuel > 0 ) then {
["ace_displayTextStructured", [[LSTRING(Hint_RemainingFuel), _fuel], 2, _unit], _unit] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [[LSTRING(Hint_RemainingFuel), _fuel], 2, _unit], _unit] call CBA_fnc_targetEvent;
} else { } else {
["ace_displayTextStructured", [LSTRING(Hint_Empty), 2, _unit], _unit] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [LSTRING(Hint_Empty), 2, _unit], _unit] call CBA_fnc_targetEvent;
}; };
true true
}, },

2
addons/refuel/functions/fnc_connectNozzleAction.sqf
View File

@ -119,7 +119,7 @@ _endPosTestOffset set [2, (_startingOffset select 2)];
}; };
}; };
}; };
["ace_setVectorDirAndUp", [_nozzle, _dirAndUp], _nozzle] call CBA_fnc_targetEvent; [QEGVAR(common,setVectorDirAndUp), [_nozzle, _dirAndUp], _nozzle] call CBA_fnc_targetEvent;
_nozzle setVariable [QGVAR(sink), _target, true]; _nozzle setVariable [QGVAR(sink), _target, true];
_nozzle setVariable [QGVAR(isConnected), true, true]; _nozzle setVariable [QGVAR(isConnected), true, true];
_target setVariable [QGVAR(nozzle), _nozzle, true]; _target setVariable [QGVAR(nozzle), _nozzle, true];

2
addons/refuel/functions/fnc_refuel.sqf
View File

@ -79,7 +79,7 @@ private _maxFuel = getNumber (configFile >> "CfgVehicles" >> (typeOf _target) >>
}; };
_unit setVariable [QGVAR(tempFuel), _fuelInSink]; _unit setVariable [QGVAR(tempFuel), _fuelInSink];
["ace_setFuel", [_sink, _fuelInSink], _sink] call CBA_fnc_targetEvent; [QEGVAR(common,setFuel), [_sink, _fuelInSink], _sink] call CBA_fnc_targetEvent;
[_source, _fuelInSource] call FUNC(setFuel); [_source, _fuelInSource] call FUNC(setFuel);
} else { } else {
_unit setVariable [QGVAR(tempFuel), fuel _sink]; _unit setVariable [QGVAR(tempFuel), fuel _sink];

2
addons/repair/XEH_postInit.sqf
View File

@ -5,5 +5,3 @@
// wheels // wheels
[QGVAR(setWheelHitPointDamage), {(_this select 0) setHitPointDamage [_this select 1, _this select 2]}] call CBA_fnc_addEventHandler; [QGVAR(setWheelHitPointDamage), {(_this select 0) setHitPointDamage [_this select 1, _this select 2]}] call CBA_fnc_addEventHandler;
[QGVAR(useItem), EFUNC(common,useItem)] call CBA_fnc_addEventHandler;

4
addons/repair/config.cpp
View File

@ -24,9 +24,5 @@ class ACE_newEvents {
setWheelHitPointDamage = QGVAR(setWheelHitPointDamage); setWheelHitPointDamage = QGVAR(setWheelHitPointDamage);
setVehicleHitPointDamage = QGVAR(setVehicleHitPointDamage); setVehicleHitPointDamage = QGVAR(setVehicleHitPointDamage);
setVehicleDamage = QGVAR(setVehicleDamage); setVehicleDamage = QGVAR(setVehicleDamage);
fixPosition = "ace_fixPosition";
displayTextStructured = "ace_displayTextStructured";
engineOn = "ace_engineOn";
fixCollision = "ace_fixCollision";
AddCargoByClass = "ace_addCargoByClass"; AddCargoByClass = "ace_addCargoByClass";
}; };

2
addons/repair/functions/fnc_doRemoveTrack.sqf
View File

@ -27,7 +27,7 @@ private _hitPointDamage = _vehicle getHitPointDamage _hitPoint;
if (_hitPointDamage >= 1) exitWith {}; if (_hitPointDamage >= 1) exitWith {};
// don't die by spawning / moving the wheel // don't die by spawning / moving the wheel
["ace_fixCollision", _unit] call CBA_fnc_localEvent; [QEGVAR(common,fixCollision), _unit] call CBA_fnc_localEvent;
// spawn track // spawn track
private _newTrack = ["ACE_Track", getPosASL _unit, _hitPointDamage] call FUNC(spawnObject); private _newTrack = ["ACE_Track", getPosASL _unit, _hitPointDamage] call FUNC(spawnObject);

2
addons/repair/functions/fnc_doRemoveWheel.sqf
View File

@ -27,7 +27,7 @@ private _hitPointDamage = _vehicle getHitPointDamage _hitPoint;
if (_hitPointDamage >= 1) exitWith {}; if (_hitPointDamage >= 1) exitWith {};
// don't die by spawning / moving the wheel // don't die by spawning / moving the wheel
["ace_fixCollision", _unit] call CBA_fnc_localEvent; [QEGVAR(common,fixCollision), _unit] call CBA_fnc_localEvent;
// spawn wheel // spawn wheel
private _newWheel = ["ACE_Wheel", getPosASL _unit, _hitPointDamage] call FUNC(spawnObject); private _newWheel = ["ACE_Wheel", getPosASL _unit, _hitPointDamage] call FUNC(spawnObject);

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

@ -38,10 +38,10 @@ _engineerRequired = if (isNumber (_config >> "requiredEngineer")) then {
if !([_caller, _engineerRequired] call FUNC(isEngineer)) exitWith {false}; if !([_caller, _engineerRequired] call FUNC(isEngineer)) exitWith {false};
if ((isEngineOn _target) && {GVAR(autoShutOffEngineWhenStartingRepair)}) then { if ((isEngineOn _target) && {GVAR(autoShutOffEngineWhenStartingRepair)}) then {
["ace_engineOn", [_target, false], _target] call CBA_fnc_targetEvent; [QEGVAR(common,engineOn), [_target, false], _target] call CBA_fnc_targetEvent;
}; };
if ((isEngineOn _target) && {!GVAR(autoShutOffEngineWhenStartingRepair)}) exitWith { if ((isEngineOn _target) && {!GVAR(autoShutOffEngineWhenStartingRepair)}) exitWith {
["ace_displayTextStructured", [LSTRING(shutOffEngineWarning), 1.5, _caller]] call CBA_fnc_localEvent; [LSTRING(shutOffEngineWarning), 1.5, _caller] call EFUNC(common,displayTextStructured);
false false
}; };
@ -235,7 +235,7 @@ if (_target != _caller) then {
}; };
if (_displayText != "") then { if (_displayText != "") then {
["ace_displayTextStructured", [[_displayText, [_caller] call EFUNC(common,getName), [_target] call EFUNC(common,getName)], 1.5, _caller], [_caller]] call CBA_fnc_targetEvent; [QEGVAR(common,displayTextStructured), [[_displayText, [_caller] call EFUNC(common,getName), [_target] call EFUNC(common,getName)], 1.5, _caller], [_caller]] call CBA_fnc_targetEvent;
}; };
true; true;

4
addons/repair/functions/fnc_spawnObject.sqf
View File

@ -28,7 +28,7 @@ _newObject setPosASL _position;
_newObject setDamage _damage; _newObject setDamage _damage;
["ace_fixCollision", _newObject] call CBA_fnc_localEvent; [QEGVAR(common,fixCollision), _newObject] call CBA_fnc_localEvent;
["ace_fixPosition", _newObject] call CBA_fnc_localEvent; [QEGVAR(common,fixPosition), _newObject] call CBA_fnc_localEvent;
_newObject _newObject

2
addons/repair/functions/fnc_useItem.sqf
View File

@ -20,7 +20,7 @@ params ["_unit", "_item"];
TRACE_2("params",_unit,_item); TRACE_2("params",_unit,_item);
if ([_unit, _item] call EFUNC(common,hasItem)) exitWith { if ([_unit, _item] call EFUNC(common,hasItem)) exitWith {
[QGVAR(useItem), [_unit, _item], _unit] call CBA_fnc_targetEvent; ["ace_useItem", [_unit, _item], _unit] call CBA_fnc_targetEvent;
[true, _unit]; [true, _unit];
}; };

1
addons/sandbag/config.cpp
View File

@ -18,6 +18,5 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents { class ACE_newEvents {
medical_onUnconscious = "ace_unconscious";
interactMenuOpened = "ace_interactMenuOpened"; interactMenuOpened = "ace_interactMenuOpened";
}; };

9
addons/scopes/config.cpp
View File

@ -14,16 +14,7 @@ class CfgPatches {
}; };
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgSounds.hpp" #include "CfgSounds.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "RscTitles.hpp" #include "RscTitles.hpp"
class ACE_newEvents {
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
};

1
addons/sitting/config.cpp
View File

@ -20,5 +20,4 @@ class CfgPatches {
class ACE_newEvents { class ACE_newEvents {
SetHandcuffed = QEGVAR(captives,setHandcuffed); SetHandcuffed = QEGVAR(captives,setHandcuffed);
medical_onUnconscious = "ace_unconscious";
}; };

5
addons/spectator/functions/fnc_respawnTemplate.sqf
View File

@ -21,11 +21,6 @@
params [["_unit",objNull,[objNull]], ["_killer",objNull,[objNull]], ["_respawn",0,[0]], ["_respawnDelay",0,[0]]]; params [["_unit",objNull,[objNull]], ["_killer",objNull,[objNull]], ["_respawn",0,[0]], ["_respawnDelay",0,[0]]];
private ["_vision","_pos"]; private ["_vision","_pos"];
// When all are dead with respawn type "None" the mission should end
if ((_respawn == 0) && {{alive _x} count allPlayers <= 0}) exitWith {
["BIS_fnc_endMission", ["endDeath", false]] call EFUNC(common,globalEvent); //???
};
// Some environment information can be used for the initial camera attributes // Some environment information can be used for the initial camera attributes
if (isNull _killer) then {_killer = _unit}; if (isNull _killer) then {_killer = _unit};
_vision = [-2,-1] select (sunOrMoon < 1); _vision = [-2,-1] select (sunOrMoon < 1);

4
addons/switchunits/config.cpp
View File

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

1
addons/tacticalladder/config.cpp
View File

@ -18,5 +18,4 @@ class CfgPatches {
class ACE_newEvents { class ACE_newEvents {
interactMenuOpened = "ace_interactMenuOpened"; interactMenuOpened = "ace_interactMenuOpened";
medical_onUnconscious = "ace_unconscious";
}; };

1
addons/trenches/config.cpp
View File

@ -18,6 +18,5 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents { class ACE_newEvents {
medical_onUnconscious = "ace_unconscious";
interactMenuOpened = "ace_interactMenuOpened"; interactMenuOpened = "ace_interactMenuOpened";
}; };

1
addons/tripod/config.cpp
View File

@ -18,6 +18,5 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents { class ACE_newEvents {
medical_onUnconscious = "ace_unconscious";
interactMenuOpened = "ace_interactMenuOpened"; interactMenuOpened = "ace_interactMenuOpened";
}; };

4
addons/weaponselect/config.cpp
View File

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

7
addons/winddeflection/config.cpp
View File

@ -24,10 +24,3 @@ class CfgAddons {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
class ACE_newEvents {
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
firedPlayerVehicle = "ace_firedPlayerVehicle";
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
};