mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Remove duplicate ACE_newEvents entries
This commit is contained in:
parent
c4b75160a4
commit
207d6612da
@ -49,4 +49,4 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) ==
|
|||||||
[] call FUNC(init);
|
[] call FUNC(init);
|
||||||
[] call FUNC(restore_user_data);
|
[] call FUNC(restore_user_data);
|
||||||
|
|
||||||
["ace_rangerfinderData", {_this call FUNC(sord)}] call CBA_fnc_addEventHandler;
|
["ace_rangefinderData", {_this call FUNC(sord)}] call CBA_fnc_addEventHandler;
|
||||||
|
@ -16,5 +16,5 @@ class CfgPatches {
|
|||||||
#include "CfgWeapons.hpp"
|
#include "CfgWeapons.hpp"
|
||||||
#include "RscTitles.hpp"
|
#include "RscTitles.hpp"
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
RangerfinderData = "ace_rangerfinderData";
|
RangerfinderData = "ace_rangefinderData";
|
||||||
};
|
};
|
@ -16,5 +16,4 @@ class CfgPatches {
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
backpackOpened = "ace_backpackOpened";
|
backpackOpened = "ace_backpackOpened";
|
||||||
backpackOpened = "ace_backpackOpened";
|
|
||||||
};
|
};
|
@ -27,11 +27,4 @@ class ACE_newEvents {
|
|||||||
MoveInCaptive = "ace_moveInCaptive";
|
MoveInCaptive = "ace_moveInCaptive";
|
||||||
playerChanged = "ace_playerChanged";
|
playerChanged = "ace_playerChanged";
|
||||||
CaptiveStatusChanged = "ace_captiveStatusChanged";
|
CaptiveStatusChanged = "ace_captiveStatusChanged";
|
||||||
CaptiveStatusChanged = "ace_captiveStatusChanged";
|
|
||||||
SetSurrendered = "ace_setSurrendered";
|
|
||||||
SetHandcuffed = "ace_setHandcuffed";
|
|
||||||
MoveOutCaptive = "ace_moveOutCaptive";
|
|
||||||
SetHandcuffed = "ace_setHandcuffed";
|
|
||||||
MoveInCaptive = "ace_moveInCaptive";
|
|
||||||
SetHandcuffed = "ace_setHandcuffed";
|
|
||||||
};
|
};
|
@ -22,15 +22,9 @@ class ACE_newEvents {
|
|||||||
cargoUnloaded = "ace_cargoUnloaded";
|
cargoUnloaded = "ace_cargoUnloaded";
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
displayTextStructured = "ace_displayTextStructured";
|
||||||
cargoLoaded = "ace_cargoLoaded";
|
cargoLoaded = "ace_cargoLoaded";
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
AddCargoByClass = "ace_addCargoByClass";
|
AddCargoByClass = "ace_addCargoByClass";
|
||||||
ServerUnloadCargo = "ace_serverUnloadCargo";
|
ServerUnloadCargo = "ace_serverUnloadCargo";
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
UnloadCargo = "ace_unloadCargo";
|
UnloadCargo = "ace_unloadCargo";
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
LoadCargo = "ace_loadCargo";
|
|
||||||
hideObjectGlobal = "ace_hideObjectGlobal";
|
hideObjectGlobal = "ace_hideObjectGlobal";
|
||||||
AddCargoByClass = "ace_addCargoByClass";
|
|
||||||
cargoAddedByClass = "ace_cargoAddedByClass";
|
cargoAddedByClass = "ace_cargoAddedByClass";
|
||||||
};
|
};
|
@ -178,14 +178,14 @@ if (isServer) then {
|
|||||||
if (!isServer) then {
|
if (!isServer) then {
|
||||||
["PlayerJip", {
|
["PlayerJip", {
|
||||||
ACE_LOGINFO("JIP event synchronization initialized");
|
ACE_LOGINFO("JIP event synchronization initialized");
|
||||||
["ace_sEH_all", [player]] call CBA_fnc_serverEvent;
|
["ace_SEH_all", [player]] call CBA_fnc_serverEvent;
|
||||||
}] call CBA_fnc_addEventHandler;
|
}] call CBA_fnc_addEventHandler;
|
||||||
} else {
|
} else {
|
||||||
["ace_sEH_all", FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
|
["ace_SEH_all", FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
|
||||||
};
|
};
|
||||||
|
|
||||||
["ace_sEH", FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
|
["ace_SEH", FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
|
||||||
["ace_sEH_s", FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
|
["ace_SEH_s", FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
if (isServer) then {
|
if (isServer) then {
|
||||||
[FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
|
[FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
|
||||||
|
@ -30,10 +30,9 @@ class ACE_newEvents {
|
|||||||
playerChanged = "ace_playerChanged";
|
playerChanged = "ace_playerChanged";
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
SettingsInitialized = "ace_settingsInitialized";
|
||||||
InitSettingsFromModules = "ace_initSettingsFromModules";
|
InitSettingsFromModules = "ace_initSettingsFromModules";
|
||||||
SEH_s = "ace_sEH_s";
|
SEH_s = "ace_SEH_s";
|
||||||
SEH = "ace_sEH";
|
SEH = "ace_SEH";
|
||||||
SEH_all = "ace_sEH_all";
|
SEH_all = "ace_SEH_all";
|
||||||
SEH_all = "ace_sEH_all";
|
|
||||||
enableSimulationGlobal = "ace_enableSimulationGlobal";
|
enableSimulationGlobal = "ace_enableSimulationGlobal";
|
||||||
hideObjectGlobal = "ace_hideObjectGlobal";
|
hideObjectGlobal = "ace_hideObjectGlobal";
|
||||||
setVanillaHitPointDamage = "ace_setVanillaHitPointDamage";
|
setVanillaHitPointDamage = "ace_setVanillaHitPointDamage";
|
||||||
@ -53,24 +52,8 @@ class ACE_newEvents {
|
|||||||
fixFloating = "ace_fixFloating";
|
fixFloating = "ace_fixFloating";
|
||||||
fixCollision = "ace_fixCollision";
|
fixCollision = "ace_fixCollision";
|
||||||
setStatusEffect = "ace_setStatusEffect";
|
setStatusEffect = "ace_setStatusEffect";
|
||||||
SEH_s = "ace_sEH_s";
|
|
||||||
SEH_s = "ace_sEH_s";
|
|
||||||
setSpeaker = "ace_setSpeaker";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
unloadPersonEvent = "ace_unloadPersonEvent";
|
|
||||||
hideObjectGlobal = "ace_hideObjectGlobal";
|
|
||||||
SEH = "ace_sEH";
|
|
||||||
SettingChanged = "ace_settingChanged";
|
SettingChanged = "ace_settingChanged";
|
||||||
SettingChanged = "ace_settingChanged";
|
|
||||||
SEH_s = "ace_sEH_s";
|
|
||||||
setSpeaker = "ace_setSpeaker";
|
|
||||||
setSpeaker = "ace_setSpeaker";
|
|
||||||
setSpeaker = "ace_setSpeaker";
|
|
||||||
loadPersonEvent = "ace_loadPersonEvent";
|
|
||||||
hideObjectGlobal = "ace_hideObjectGlobal";
|
|
||||||
HeadbugFixUsed = "ace_headbugFixUsed";
|
HeadbugFixUsed = "ace_headbugFixUsed";
|
||||||
HeadbugFixUsed = "ace_headbugFixUsed";
|
|
||||||
blockDamage = "ace_blockDamage";
|
|
||||||
blockDamage = "ace_blockDamage";
|
blockDamage = "ace_blockDamage";
|
||||||
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
|
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
|
||||||
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
|
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
|
||||||
@ -78,18 +61,8 @@ class ACE_newEvents {
|
|||||||
firedNonPlayer = "ace_firedNonPlayer";
|
firedNonPlayer = "ace_firedNonPlayer";
|
||||||
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
switchMove = "ace_switchMove";
|
|
||||||
playMoveNow = "ace_playMoveNow";
|
|
||||||
playMoveNow = "ace_playMoveNow";
|
|
||||||
playMoveNow = "ace_playMoveNow";
|
|
||||||
playMoveNow = "ace_playMoveNow";
|
|
||||||
playMove = "ace_playMove";
|
|
||||||
playMove = "ace_playMove";
|
|
||||||
unlockVehicle = "ace_unlockVehicle";
|
unlockVehicle = "ace_unlockVehicle";
|
||||||
lockVehicle = "ace_lockVehicle";
|
lockVehicle = "ace_lockVehicle";
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
SettingChanged = "ace_settingChanged";
|
|
||||||
playMoveNow = QGVAR(playMoveNow);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#include "CfgEventHandlers.hpp"
|
#include "CfgEventHandlers.hpp"
|
||||||
|
@ -18,7 +18,7 @@ params ["_client"];
|
|||||||
private _eventEntry = HASH_GET(GVAR(syncedEvents),_x);
|
private _eventEntry = HASH_GET(GVAR(syncedEvents),_x);
|
||||||
_eventEntry params ["", "_eventLog"];
|
_eventEntry params ["", "_eventLog"];
|
||||||
|
|
||||||
["ace_sEH_s", [_x, _eventLog], _client] call CBA_fnc_targetEvent;
|
["ace_SEH_s", [_x, _eventLog], _client] call CBA_fnc_targetEvent;
|
||||||
false
|
false
|
||||||
} count (GVAR(syncedEvents) select 0);
|
} count (GVAR(syncedEvents) select 0);
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ if (isServer) then {
|
|||||||
private _eventEntry = HASH_GET(GVAR(syncedEvents),_eventName);
|
private _eventEntry = HASH_GET(GVAR(syncedEvents),_eventName);
|
||||||
_eventEntry params ["", "_eventLog"];
|
_eventEntry params ["", "_eventLog"];
|
||||||
|
|
||||||
["ace_sEH_s", [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
|
["ace_SEH_s", [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
|
||||||
} else {
|
} else {
|
||||||
params ["_eventName", "_eventLog"];
|
params ["_eventName", "_eventLog"];
|
||||||
|
|
||||||
|
@ -17,4 +17,4 @@ params ["_eventName"];
|
|||||||
// Only JIP machines on initialization send this off, requesting sync on events with the serverCommand
|
// Only JIP machines on initialization send this off, requesting sync on events with the serverCommand
|
||||||
if (isServer) exitWith {false};
|
if (isServer) exitWith {false};
|
||||||
|
|
||||||
["ace_sEH_s", [_eventName, ACE_player]] call CBA_fnc_serverEvent;
|
["ace_SEH_s", [_eventName, ACE_player]] call CBA_fnc_serverEvent;
|
||||||
|
@ -23,4 +23,4 @@ if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith {
|
|||||||
|
|
||||||
private _eventData = [_name, _args, _ttl];
|
private _eventData = [_name, _args, _ttl];
|
||||||
|
|
||||||
["ace_sEH", _eventData] call CBA_fnc_globalEvent;
|
["ace_SEH", _eventData] call CBA_fnc_globalEvent;
|
||||||
|
@ -30,4 +30,4 @@ GVAR(vectorConnected) = false;
|
|||||||
GVAR(noVectorData) = true;
|
GVAR(noVectorData) = true;
|
||||||
GVAR(vectorGrid) = "00000000";
|
GVAR(vectorGrid) = "00000000";
|
||||||
|
|
||||||
["ace_rangerfinderData", FUNC(handleRangeFinderData)] call CBA_fnc_addEventHandler;
|
["ace_rangefinderData", FUNC(handleRangeFinderData)] call CBA_fnc_addEventHandler;
|
||||||
|
@ -18,5 +18,5 @@ class CfgPatches {
|
|||||||
#include "RscTitles.hpp"
|
#include "RscTitles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
RangerfinderData = "ace_rangerfinderData";
|
RangerfinderData = "ace_rangefinderData";
|
||||||
};
|
};
|
@ -21,6 +21,4 @@ class CfgPatches {
|
|||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
DisarmDebugCallback = "ace_disarmDebugCallback";
|
DisarmDebugCallback = "ace_disarmDebugCallback";
|
||||||
DisarmDropItems = "ace_disarmDropItems";
|
DisarmDropItems = "ace_disarmDropItems";
|
||||||
DisarmDropItems = "ace_disarmDropItems";
|
|
||||||
DisarmDebugCallback = "ace_disarmDebugCallback";
|
|
||||||
};
|
};
|
@ -25,11 +25,4 @@ class ACE_newEvents {
|
|||||||
fixFloating = "ace_fixFloating";
|
fixFloating = "ace_fixFloating";
|
||||||
fixPosition = "ace_fixPosition";
|
fixPosition = "ace_fixPosition";
|
||||||
fixCollision = "ace_fixCollision";
|
fixCollision = "ace_fixCollision";
|
||||||
fixCollision = "ace_fixCollision";
|
|
||||||
fixFloating = "ace_fixFloating";
|
|
||||||
fixPosition = "ace_fixPosition";
|
|
||||||
fixCollision = "ace_fixCollision";
|
|
||||||
fixCollision = "ace_fixCollision";
|
|
||||||
setDir = "ace_setDir";
|
|
||||||
setDir = "ace_setDir";
|
|
||||||
};
|
};
|
@ -13,9 +13,7 @@ class CfgPatches {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#include "CfgEventHandlers.hpp"
|
#include "CfgEventHandlers.hpp"
|
||||||
|
|
||||||
#include "CfgWeapons.hpp"
|
#include "CfgWeapons.hpp"
|
||||||
|
|
||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
|
@ -276,5 +276,4 @@ class ACE_newEvents {
|
|||||||
cameraViewChanged = "ace_cameraViewChanged";
|
cameraViewChanged = "ace_cameraViewChanged";
|
||||||
GlassesChanged = "ace_glassesChanged";
|
GlassesChanged = "ace_glassesChanged";
|
||||||
GlassesCracked = "ace_glassesCracked";
|
GlassesCracked = "ace_glassesCracked";
|
||||||
GlassesCracked = "ace_glassesCracked";
|
|
||||||
};
|
};
|
@ -25,5 +25,4 @@ class ACE_newEvents {
|
|||||||
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
flashbangExplosion = "ace_flashbangExplosion";
|
flashbangExplosion = "ace_flashbangExplosion";
|
||||||
flashbangExplosion = "ace_flashbangExplosion";
|
|
||||||
};
|
};
|
@ -29,9 +29,5 @@ class ACE_newEvents {
|
|||||||
playerChanged = "ace_playerChanged";
|
playerChanged = "ace_playerChanged";
|
||||||
interactMenuOpened = "ace_interactMenuOpened";
|
interactMenuOpened = "ace_interactMenuOpened";
|
||||||
clearConditionCaches = "ace_clearConditionCaches";
|
clearConditionCaches = "ace_clearConditionCaches";
|
||||||
clearConditionCaches = "ace_clearConditionCaches";
|
|
||||||
interactMenuClosed = "ace_interactMenuClosed";
|
interactMenuClosed = "ace_interactMenuClosed";
|
||||||
clearConditionCaches = "ace_clearConditionCaches";
|
|
||||||
clearConditionCaches = "ace_clearConditionCaches";
|
|
||||||
interactMenuOpened = "ace_interactMenuOpened";
|
|
||||||
};
|
};
|
@ -25,9 +25,6 @@ class ACE_newEvents {
|
|||||||
sendAway = "ace_sendAway";
|
sendAway = "ace_sendAway";
|
||||||
setVelocity = "ace_setVelocity";
|
setVelocity = "ace_setVelocity";
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
displayTextStructured = "ace_displayTextStructured";
|
||||||
pardon = "ace_pardon";
|
CBA_teamColorChanged = "ace_CBA_teamColorChanged";
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
CBA_teamColorChanged = "ace_cBA_teamColorChanged";
|
|
||||||
getDown = "ace_getDown";
|
|
||||||
selectLeader = "ace_selectLeader";
|
selectLeader = "ace_selectLeader";
|
||||||
};
|
};
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
params ["_unit", "_team"];
|
params ["_unit", "_team"];
|
||||||
|
|
||||||
["ace_cBA_teamColorChanged", [_unit, _team]] call CBA_fnc_globalEvent;
|
["ace_CBA_teamColorChanged", [_unit, _team]] call CBA_fnc_globalEvent;
|
||||||
|
|
||||||
// display message
|
// display message
|
||||||
if (_unit == ACE_player) then {
|
if (_unit == ACE_player) then {
|
||||||
|
@ -17,6 +17,4 @@ class CfgPatches {
|
|||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
laser_laserOff = "ace_laser_laserOff";
|
laser_laserOff = "ace_laser_laserOff";
|
||||||
laser_laserOn = "ace_laser_laserOn";
|
laser_laserOn = "ace_laser_laserOn";
|
||||||
laser_laserOn = "ace_laser_laserOn";
|
|
||||||
laser_laserOff = "ace_laser_laserOff";
|
|
||||||
};
|
};
|
@ -72,8 +72,4 @@ class ACE_newEvents {
|
|||||||
drawing_requestMarkers = "ace_drawing_requestMarkers";
|
drawing_requestMarkers = "ace_drawing_requestMarkers";
|
||||||
drawing_addLineMarker = "ace_drawing_addLineMarker";
|
drawing_addLineMarker = "ace_drawing_addLineMarker";
|
||||||
drawing_removeLineMarker = "ace_drawing_removeLineMarker";
|
drawing_removeLineMarker = "ace_drawing_removeLineMarker";
|
||||||
drawing_addLineMarker = "ace_drawing_addLineMarker";
|
|
||||||
drawing_removeLineMarker = "ace_drawing_removeLineMarker";
|
|
||||||
drawing_requestMarkers = "ace_drawing_requestMarkers";
|
|
||||||
drawing_sendbackMarkers = "ace_drawing_sendbackMarkers";
|
|
||||||
};
|
};
|
@ -50,63 +50,14 @@ class ACE_newEvents {
|
|||||||
medical_woundUpdateRequest = "ace_medical_woundUpdateRequest";
|
medical_woundUpdateRequest = "ace_medical_woundUpdateRequest";
|
||||||
medical_propagateWound = "ace_medical_propagateWound";
|
medical_propagateWound = "ace_medical_propagateWound";
|
||||||
useItem = "ace_useItem";
|
useItem = "ace_useItem";
|
||||||
useItem = "ace_useItem";
|
|
||||||
useItem = "ace_useItem";
|
|
||||||
useItem = "ace_useItem";
|
|
||||||
useItem = "ace_useItem";
|
|
||||||
useItem = "ace_useItem";
|
|
||||||
medical_onUnconscious = "ace_medical_onUnconscious";
|
|
||||||
medical_onUnconscious = "ace_medical_onUnconscious";
|
|
||||||
medical_treatmentSuccess = "ace_medical_treatmentSuccess";
|
medical_treatmentSuccess = "ace_medical_treatmentSuccess";
|
||||||
treatmentTourniquetLocal = "ace_treatmentTourniquetLocal";
|
|
||||||
treatmentTourniquetLocal = "ace_treatmentTourniquetLocal";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
displayTextStructured = "ace_displayTextStructured";
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
treatmentIVLocal = "ace_treatmentIVLocal";
|
|
||||||
treatmentIVLocal = "ace_treatmentIVLocal";
|
|
||||||
treatmentBasic_morphineLocal = "ace_treatmentBasic_morphineLocal";
|
|
||||||
treatmentBasic_morphineLocal = "ace_treatmentBasic_morphineLocal";
|
|
||||||
treatmentBasic_bloodbagLocal = "ace_treatmentBasic_bloodbagLocal";
|
|
||||||
treatmentBasic_bloodbagLocal = "ace_treatmentBasic_bloodbagLocal";
|
|
||||||
treatmentBasic_bandageLocal = "ace_treatmentBasic_bandageLocal";
|
|
||||||
treatmentBasic_bandageLocal = "ace_treatmentBasic_bandageLocal";
|
|
||||||
treatmentAdvanced_medicationLocal = "ace_treatmentAdvanced_medicationLocal";
|
|
||||||
treatmentAdvanced_fullHealLocal = "ace_treatmentAdvanced_fullHealLocal";
|
|
||||||
treatmentAdvanced_fullHealLocal = "ace_treatmentAdvanced_fullHealLocal";
|
|
||||||
treatmentAdvanced_CPRLocal = "ace_treatmentAdvanced_CPRLocal";
|
|
||||||
treatmentAdvanced_CPRLocal = "ace_treatmentAdvanced_CPRLocal";
|
|
||||||
medical_propagateWound = "ace_medical_propagateWound";
|
|
||||||
treatmentAdvanced_bandageLocal = "ace_treatmentAdvanced_bandageLocal";
|
|
||||||
treatmentAdvanced_bandageLocal = "ace_treatmentAdvanced_bandageLocal";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
medical_onUnconscious = "ace_medical_onUnconscious";
|
|
||||||
setUnconscious = "ace_setUnconscious";
|
|
||||||
setHitPointDamage = "ace_setHitPointDamage";
|
|
||||||
medical_onSetDead = "ace_medical_onSetDead";
|
medical_onSetDead = "ace_medical_onSetDead";
|
||||||
setDead = "ace_setDead";
|
|
||||||
Medical_onEnteredCardiacArrest = "ace_medical_onEnteredCardiacArrest";
|
Medical_onEnteredCardiacArrest = "ace_medical_onEnteredCardiacArrest";
|
||||||
hideObjectGlobal = "ace_hideObjectGlobal";
|
hideObjectGlobal = "ace_hideObjectGlobal";
|
||||||
medical_woundUpdateRequest = "ace_medical_woundUpdateRequest";
|
|
||||||
medical_propagateWound = "ace_medical_propagateWound";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
addVitalLoop = "ace_addVitalLoop";
|
addVitalLoop = "ace_addVitalLoop";
|
||||||
Medical_onItemAddedToTriageCard = "ace_medical_onItemAddedToTriageCard";
|
Medical_onItemAddedToTriageCard = "ace_medical_onItemAddedToTriageCard";
|
||||||
addToTriageCard = "ace_addToTriageCard";
|
|
||||||
medical_onLogEntryAdded = "ace_medical_onLogEntryAdded";
|
medical_onLogEntryAdded = "ace_medical_onLogEntryAdded";
|
||||||
addToMedicalLog = "ace_addToMedicalLog";
|
|
||||||
Medical_onHeartRateAdjustmentAdded = "ace_medical_onHeartRateAdjustmentAdded";
|
Medical_onHeartRateAdjustmentAdded = "ace_medical_onHeartRateAdjustmentAdded";
|
||||||
unloadPersonEvent = "ace_unloadPersonEvent";
|
unloadPersonEvent = "ace_unloadPersonEvent";
|
||||||
treatmentAdvanced_medicationLocal = "ace_treatmentAdvanced_medicationLocal";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
placedInBodyBag = "ace_placedInBodyBag";
|
|
||||||
actionPlaceInBodyBag = "ace_actionPlaceInBodyBag";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
actionCheckPulseLocal = "ace_actionCheckPulseLocal";
|
|
||||||
actionCheckPulseLocal = "ace_actionCheckPulseLocal";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
actionCheckBloodPressureLocal = "ace_actionCheckBloodPressureLocal";
|
|
||||||
actionCheckBloodPressureLocal = "ace_actionCheckBloodPressureLocal";
|
|
||||||
};
|
};
|
@ -20,7 +20,7 @@ _closeCode = {
|
|||||||
|
|
||||||
|
|
||||||
//Add Eventhandler:
|
//Add Eventhandler:
|
||||||
["ace_rangerfinderData", {_this call FUNC(recieveRangefinderData)}] call CBA_fnc_addEventHandler;
|
["ace_rangefinderData", {_this call FUNC(recieveRangefinderData)}] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
//Global Variables to default:
|
//Global Variables to default:
|
||||||
GVAR(gpsPositionASL) = [0,0,0];
|
GVAR(gpsPositionASL) = [0,0,0];
|
||||||
|
@ -19,5 +19,5 @@ class CfgPatches {
|
|||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
RangerfinderData = "ace_rangerfinderData";
|
RangerfinderData = "ace_rangefinderData";
|
||||||
};
|
};
|
@ -37,5 +37,4 @@ class ACE_newEvents {
|
|||||||
infoDisplayChanged = "ace_infoDisplayChanged";
|
infoDisplayChanged = "ace_infoDisplayChanged";
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
playerVehicleChanged = "ace_playerVehicleChanged";
|
||||||
initMortar = "ace_initMortar";
|
initMortar = "ace_initMortar";
|
||||||
initMortar = "ace_initMortar";
|
|
||||||
};
|
};
|
@ -58,9 +58,6 @@ class ACE_newEvents {
|
|||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
spareBarrelsLoadCoolest = "ace_spareBarrelsLoadCoolest";
|
spareBarrelsLoadCoolest = "ace_spareBarrelsLoadCoolest";
|
||||||
spareBarrelsSendTemperatureHint = "ace_spareBarrelsSendTemperatureHint";
|
spareBarrelsSendTemperatureHint = "ace_spareBarrelsSendTemperatureHint";
|
||||||
spareBarrelsLoadCoolest = "ace_spareBarrelsLoadCoolest";
|
|
||||||
initiateSwapBarrelAssisted = "ace_initiateSwapBarrelAssisted";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
displayTextStructured = "ace_displayTextStructured";
|
||||||
showWeaponTemperature = "ace_showWeaponTemperature";
|
|
||||||
weaponJammed = "ace_weaponJammed";
|
weaponJammed = "ace_weaponJammed";
|
||||||
};
|
};
|
@ -19,6 +19,4 @@ class ACE_newEvents {
|
|||||||
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
overpressure = "ace_overpressure";
|
overpressure = "ace_overpressure";
|
||||||
overpressure = "ace_overpressure";
|
|
||||||
overpressure = "ace_overpressure";
|
|
||||||
};
|
};
|
@ -21,5 +21,4 @@ class ACE_newEvents {
|
|||||||
setFuel = "ace_setFuel";
|
setFuel = "ace_setFuel";
|
||||||
setVectorDirAndUp = "ace_setVectorDirAndUp";
|
setVectorDirAndUp = "ace_setVectorDirAndUp";
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
displayTextStructured = "ace_displayTextStructured";
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
};
|
};
|
@ -25,8 +25,5 @@ class CfgPatches {
|
|||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
setAmmoSync = "ace_setAmmoSync";
|
setAmmoSync = "ace_setAmmoSync";
|
||||||
returnedAmmo = "ace_returnedAmmo";
|
returnedAmmo = "ace_returnedAmmo";
|
||||||
setAmmoSync = "ace_setAmmoSync";
|
|
||||||
returnedAmmo = "ace_returnedAmmo";
|
|
||||||
returnedAmmo = "ace_returnedAmmo";
|
|
||||||
linkedAmmo = "ace_linkedAmmo";
|
linkedAmmo = "ace_linkedAmmo";
|
||||||
};
|
};
|
@ -19,5 +19,4 @@ class CfgPatches {
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
reloadLauncher = "ace_reloadLauncher";
|
reloadLauncher = "ace_reloadLauncher";
|
||||||
reloadLauncher = "ace_reloadLauncher";
|
|
||||||
};
|
};
|
@ -24,18 +24,8 @@ class ACE_newEvents {
|
|||||||
setVehicleHitPointDamage = "ace_setVehicleHitPointDamage";
|
setVehicleHitPointDamage = "ace_setVehicleHitPointDamage";
|
||||||
setVehicleDamage = "ace_setVehicleDamage";
|
setVehicleDamage = "ace_setVehicleDamage";
|
||||||
fixPosition = "ace_fixPosition";
|
fixPosition = "ace_fixPosition";
|
||||||
fixCollision = "ace_fixCollision";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
displayTextStructured = "ace_displayTextStructured";
|
||||||
engineOn = "ace_engineOn";
|
engineOn = "ace_engineOn";
|
||||||
setWheelHitPointDamage = "ace_setWheelHitPointDamage";
|
|
||||||
setWheelHitPointDamage = "ace_setWheelHitPointDamage";
|
|
||||||
setWheelHitPointDamage = "ace_setWheelHitPointDamage";
|
|
||||||
setVehicleHitPointDamage = "ace_setVehicleHitPointDamage";
|
|
||||||
setVehicleHitPointDamage = "ace_setVehicleHitPointDamage";
|
|
||||||
setWheelHitPointDamage = "ace_setWheelHitPointDamage";
|
|
||||||
fixCollision = "ace_fixCollision";
|
|
||||||
setWheelHitPointDamage = "ace_setWheelHitPointDamage";
|
|
||||||
fixCollision = "ace_fixCollision";
|
fixCollision = "ace_fixCollision";
|
||||||
AddCargoByClass = "ace_addCargoByClass";
|
AddCargoByClass = "ace_addCargoByClass";
|
||||||
};
|
};
|
@ -23,6 +23,4 @@ class ACE_newEvents {
|
|||||||
playerChanged = "ace_playerChanged";
|
playerChanged = "ace_playerChanged";
|
||||||
rallypointMoved = "ace_rallypointMoved";
|
rallypointMoved = "ace_rallypointMoved";
|
||||||
killedByFriendly = "ace_killedByFriendly";
|
killedByFriendly = "ace_killedByFriendly";
|
||||||
rallypointMoved = "ace_rallypointMoved";
|
|
||||||
rallypointMoved = "ace_rallypointMoved";
|
|
||||||
};
|
};
|
@ -17,7 +17,6 @@ class CfgPatches {
|
|||||||
#include "CfgWeapons.hpp"
|
#include "CfgWeapons.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
createTag = "ace_createTag";
|
|
||||||
createTag = "ace_createTag";
|
createTag = "ace_createTag";
|
||||||
tagCreated = "ace_tagCreated";
|
tagCreated = "ace_tagCreated";
|
||||||
};
|
};
|
@ -20,5 +20,5 @@ class CfgPatches {
|
|||||||
#include "RscInGameUI.hpp"
|
#include "RscInGameUI.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
RangerfinderData = "ace_rangerfinderData";
|
RangerfinderData = "ace_rangefinderData";
|
||||||
};
|
};
|
@ -22,4 +22,4 @@ _direction = call FUNC(getDirection);
|
|||||||
_azimuth = _direction select 0;
|
_azimuth = _direction select 0;
|
||||||
_inclination = _direction select 1;
|
_inclination = _direction select 1;
|
||||||
//Send Data to connected GPS
|
//Send Data to connected GPS
|
||||||
["ace_rangerfinderData", [_distance, _azimuth, _inclination]] call CBA_fnc_localEvent;
|
["ace_rangefinderData", [_distance, _azimuth, _inclination]] call CBA_fnc_localEvent;
|
@ -22,7 +22,4 @@ class ACE_newEvents {
|
|||||||
SettingsInitialized = "ace_settingsInitialized";
|
SettingsInitialized = "ace_settingsInitialized";
|
||||||
VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
|
VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
|
||||||
VehicleLock_SetupCustomKey = "ace_vehicleLock_SetupCustomKey";
|
VehicleLock_SetupCustomKey = "ace_vehicleLock_SetupCustomKey";
|
||||||
VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
|
|
||||||
VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
|
|
||||||
VehicleLock_SetupCustomKey = "ace_vehicleLock_SetupCustomKey";
|
|
||||||
};
|
};
|
@ -18,5 +18,4 @@ class CfgPatches {
|
|||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
SettingsInitialized = "ace_settingsInitialized";
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
};
|
};
|
@ -48,6 +48,4 @@ class ACE_newEvents {
|
|||||||
SetSurrendered = "ace_setSurrendered";
|
SetSurrendered = "ace_setSurrendered";
|
||||||
SetHandcuffed = "ace_setHandcuffed";
|
SetHandcuffed = "ace_setHandcuffed";
|
||||||
AddCargoByClass = "ace_addCargoByClass";
|
AddCargoByClass = "ace_addCargoByClass";
|
||||||
AddCargoByClass = "ace_addCargoByClass";
|
|
||||||
zeusUnitAssigned = "ace_zeusUnitAssigned";
|
|
||||||
};
|
};
|
Loading…
Reference in New Issue
Block a user