Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate ACE_newEvents entries

Browse Source
This commit is contained in:
SilentSpike 2016-05-24 15:06:17 +01:00
parent c4b75160a4
commit 207d6612da
53 changed files with 61 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/atragmx/XEH_postInit.sqf
View File

@ -49,4 +49,4 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) ==
[] call FUNC(init);
[] 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;

2
addons/atragmx/config.cpp
View File

@ -16,5 +16,5 @@ class CfgPatches {
#include "CfgWeapons.hpp"
#include "RscTitles.hpp"
class ACE_newEvents {
RangerfinderData = "ace_rangerfinderData";
RangerfinderData = "ace_rangefinderData";
};

1
addons/backpacks/config.cpp
View File

@ -16,5 +16,4 @@ class CfgPatches {
class ACE_newEvents {
backpackOpened = "ace_backpackOpened";
backpackOpened = "ace_backpackOpened";
};

7
addons/captives/config.cpp
View File

@ -27,11 +27,4 @@ class ACE_newEvents {
MoveInCaptive = "ace_moveInCaptive";
playerChanged = "ace_playerChanged";
CaptiveStatusChanged = "ace_captiveStatusChanged";
CaptiveStatusChanged = "ace_captiveStatusChanged";
SetSurrendered = "ace_setSurrendered";
SetHandcuffed = "ace_setHandcuffed";
MoveOutCaptive = "ace_moveOutCaptive";
SetHandcuffed = "ace_setHandcuffed";
MoveInCaptive = "ace_moveInCaptive";
SetHandcuffed = "ace_setHandcuffed";
};

6
addons/cargo/config.cpp
View File

@ -22,15 +22,9 @@ class ACE_newEvents {
cargoUnloaded = "ace_cargoUnloaded";
displayTextStructured = "ace_displayTextStructured";
cargoLoaded = "ace_cargoLoaded";
displayTextStructured = "ace_displayTextStructured";
AddCargoByClass = "ace_addCargoByClass";
ServerUnloadCargo = "ace_serverUnloadCargo";
displayTextStructured = "ace_displayTextStructured";
displayTextStructured = "ace_displayTextStructured";
UnloadCargo = "ace_unloadCargo";
displayTextStructured = "ace_displayTextStructured";
LoadCargo = "ace_loadCargo";
hideObjectGlobal = "ace_hideObjectGlobal";
AddCargoByClass = "ace_addCargoByClass";
cargoAddedByClass = "ace_cargoAddedByClass";
};

8
addons/common/XEH_postInit.sqf
View File

@ -178,14 +178,14 @@ if (isServer) then {
if (!isServer) then {
["PlayerJip", {
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;
} 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_s", FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
["ace_SEH", FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
["ace_SEH_s", FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
if (isServer) then {
[FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;

33
addons/common/config.cpp
View File

@ -30,10 +30,9 @@ class ACE_newEvents {
playerChanged = "ace_playerChanged";
SettingsInitialized = "ace_settingsInitialized";
InitSettingsFromModules = "ace_initSettingsFromModules";
SEH_s = "ace_sEH_s";
SEH = "ace_sEH";
SEH_all = "ace_sEH_all";
SEH_all = "ace_sEH_all";
SEH_s = "ace_SEH_s";
SEH = "ace_SEH";
SEH_all = "ace_SEH_all";
enableSimulationGlobal = "ace_enableSimulationGlobal";
hideObjectGlobal = "ace_hideObjectGlobal";
setVanillaHitPointDamage = "ace_setVanillaHitPointDamage";
@ -53,24 +52,8 @@ class ACE_newEvents {
fixFloating = "ace_fixFloating";
fixCollision = "ace_fixCollision";
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";
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";
blockDamage = "ace_blockDamage";
blockDamage = "ace_blockDamage";
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
@ -78,18 +61,8 @@ class ACE_newEvents {
firedNonPlayer = "ace_firedNonPlayer";
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
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";
lockVehicle = "ace_lockVehicle";
playerInventoryChanged = "ace_playerInventoryChanged";
SettingChanged = "ace_settingChanged";
playMoveNow = QGVAR(playMoveNow);
};
#include "CfgEventHandlers.hpp"

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

@ -18,7 +18,7 @@ params ["_client"];
private _eventEntry = HASH_GET(GVAR(syncedEvents),_x);
_eventEntry params ["", "_eventLog"];
["ace_sEH_s", [_x, _eventLog], _client] call CBA_fnc_targetEvent;
["ace_SEH_s", [_x, _eventLog], _client] call CBA_fnc_targetEvent;
false
} count (GVAR(syncedEvents) select 0);

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

@ -30,7 +30,7 @@ if (isServer) then {
private _eventEntry = HASH_GET(GVAR(syncedEvents),_eventName);
_eventEntry params ["", "_eventLog"];
["ace_sEH_s", [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
["ace_SEH_s", [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
} else {
params ["_eventName", "_eventLog"];

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

@ -17,4 +17,4 @@ params ["_eventName"];
// Only JIP machines on initialization send this off, requesting sync on events with the serverCommand
if (isServer) exitWith {false};
["ace_sEH_s", [_eventName, ACE_player]] call CBA_fnc_serverEvent;
["ace_SEH_s", [_eventName, ACE_player]] call CBA_fnc_serverEvent;

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

@ -23,4 +23,4 @@ if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith {
private _eventData = [_name, _args, _ttl];
["ace_sEH", _eventData] call CBA_fnc_globalEvent;
["ace_SEH", _eventData] call CBA_fnc_globalEvent;

2
addons/dagr/XEH_postInit.sqf
View File

@ -30,4 +30,4 @@ GVAR(vectorConnected) = false;
GVAR(noVectorData) = true;
GVAR(vectorGrid) = "00000000";
["ace_rangerfinderData", FUNC(handleRangeFinderData)] call CBA_fnc_addEventHandler;
["ace_rangefinderData", FUNC(handleRangeFinderData)] call CBA_fnc_addEventHandler;

2
addons/dagr/config.cpp
View File

@ -18,5 +18,5 @@ class CfgPatches {
#include "RscTitles.hpp"
class ACE_newEvents {
RangerfinderData = "ace_rangerfinderData";
RangerfinderData = "ace_rangefinderData";
};

2
addons/disarming/config.cpp
View File

@ -21,6 +21,4 @@ class CfgPatches {
class ACE_newEvents {
DisarmDebugCallback = "ace_disarmDebugCallback";
DisarmDropItems = "ace_disarmDropItems";
DisarmDropItems = "ace_disarmDropItems";
DisarmDebugCallback = "ace_disarmDebugCallback";
};

7
addons/dragging/config.cpp
View File

@ -25,11 +25,4 @@ class ACE_newEvents {
fixFloating = "ace_fixFloating";
fixPosition = "ace_fixPosition";
fixCollision = "ace_fixCollision";
fixCollision = "ace_fixCollision";
fixFloating = "ace_fixFloating";
fixPosition = "ace_fixPosition";
fixCollision = "ace_fixCollision";
fixCollision = "ace_fixCollision";
setDir = "ace_setDir";
setDir = "ace_setDir";
};

2
addons/gforces/config.cpp
View File

@ -13,9 +13,7 @@ class CfgPatches {
};
#include "CfgEventHandlers.hpp"
#include "CfgWeapons.hpp"
#include "CfgVehicles.hpp"
class ACE_newEvents {

1
addons/goggles/config.cpp
View File

@ -276,5 +276,4 @@ class ACE_newEvents {
cameraViewChanged = "ace_cameraViewChanged";
GlassesChanged = "ace_glassesChanged";
GlassesCracked = "ace_glassesCracked";
GlassesCracked = "ace_glassesCracked";
};

1
addons/grenades/config.cpp
View File

@ -25,5 +25,4 @@ class ACE_newEvents {
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
flashbangExplosion = "ace_flashbangExplosion";
flashbangExplosion = "ace_flashbangExplosion";
};

4
addons/interact_menu/config.cpp
View File

@ -29,9 +29,5 @@ class ACE_newEvents {
playerChanged = "ace_playerChanged";
interactMenuOpened = "ace_interactMenuOpened";
clearConditionCaches = "ace_clearConditionCaches";
clearConditionCaches = "ace_clearConditionCaches";
interactMenuClosed = "ace_interactMenuClosed";
clearConditionCaches = "ace_clearConditionCaches";
clearConditionCaches = "ace_clearConditionCaches";
interactMenuOpened = "ace_interactMenuOpened";
};

5
addons/interaction/config.cpp
View File

@ -25,9 +25,6 @@ class ACE_newEvents {
sendAway = "ace_sendAway";
setVelocity = "ace_setVelocity";
displayTextStructured = "ace_displayTextStructured";
pardon = "ace_pardon";
displayTextStructured = "ace_displayTextStructured";
CBA_teamColorChanged = "ace_cBA_teamColorChanged";
getDown = "ace_getDown";
CBA_teamColorChanged = "ace_CBA_teamColorChanged";
selectLeader = "ace_selectLeader";
};

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

@ -18,7 +18,7 @@
params ["_unit", "_team"];
["ace_cBA_teamColorChanged", [_unit, _team]] call CBA_fnc_globalEvent;
["ace_CBA_teamColorChanged", [_unit, _team]] call CBA_fnc_globalEvent;
// display message
if (_unit == ACE_player) then {

2
addons/laser/config.cpp
View File

@ -17,6 +17,4 @@ class CfgPatches {
class ACE_newEvents {
laser_laserOff = "ace_laser_laserOff";
laser_laserOn = "ace_laser_laserOn";
laser_laserOn = "ace_laser_laserOn";
laser_laserOff = "ace_laser_laserOff";
};

4
addons/maptools/config.cpp
View File

@ -72,8 +72,4 @@ class ACE_newEvents {
drawing_requestMarkers = "ace_drawing_requestMarkers";
drawing_addLineMarker = "ace_drawing_addLineMarker";
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";
};

49
addons/medical/config.cpp
View File

@ -50,63 +50,14 @@ class ACE_newEvents {
medical_woundUpdateRequest = "ace_medical_woundUpdateRequest";
medical_propagateWound = "ace_medical_propagateWound";
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";
treatmentTourniquetLocal = "ace_treatmentTourniquetLocal";
treatmentTourniquetLocal = "ace_treatmentTourniquetLocal";
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";
setDead = "ace_setDead";
Medical_onEnteredCardiacArrest = "ace_medical_onEnteredCardiacArrest";
hideObjectGlobal = "ace_hideObjectGlobal";
medical_woundUpdateRequest = "ace_medical_woundUpdateRequest";
medical_propagateWound = "ace_medical_propagateWound";
displayTextStructured = "ace_displayTextStructured";
addVitalLoop = "ace_addVitalLoop";
Medical_onItemAddedToTriageCard = "ace_medical_onItemAddedToTriageCard";
addToTriageCard = "ace_addToTriageCard";
medical_onLogEntryAdded = "ace_medical_onLogEntryAdded";
addToMedicalLog = "ace_addToMedicalLog";
Medical_onHeartRateAdjustmentAdded = "ace_medical_onHeartRateAdjustmentAdded";
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";
};

2
addons/microdagr/XEH_clientInit.sqf
View File

@ -20,7 +20,7 @@ _closeCode = {
//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:
GVAR(gpsPositionASL) = [0,0,0];

2
addons/microdagr/config.cpp
View File

@ -19,5 +19,5 @@ class CfgPatches {
#include "ACE_Settings.hpp"
class ACE_newEvents {
RangerfinderData = "ace_rangerfinderData";
RangerfinderData = "ace_rangefinderData";
};

1
addons/mk6mortar/config.cpp
View File

@ -37,5 +37,4 @@ class ACE_newEvents {
infoDisplayChanged = "ace_infoDisplayChanged";
playerVehicleChanged = "ace_playerVehicleChanged";
initMortar = "ace_initMortar";
initMortar = "ace_initMortar";
};

3
addons/overheating/config.cpp
View File

@ -58,9 +58,6 @@ class ACE_newEvents {
firedPlayer = "ace_firedPlayer";
spareBarrelsLoadCoolest = "ace_spareBarrelsLoadCoolest";
spareBarrelsSendTemperatureHint = "ace_spareBarrelsSendTemperatureHint";
spareBarrelsLoadCoolest = "ace_spareBarrelsLoadCoolest";
initiateSwapBarrelAssisted = "ace_initiateSwapBarrelAssisted";
displayTextStructured = "ace_displayTextStructured";
showWeaponTemperature = "ace_showWeaponTemperature";
weaponJammed = "ace_weaponJammed";
};

2
addons/overpressure/config.cpp
View File

@ -19,6 +19,4 @@ class ACE_newEvents {
firedPlayerVehicle = "ace_firedPlayerVehicle";
firedPlayer = "ace_firedPlayer";
overpressure = "ace_overpressure";
overpressure = "ace_overpressure";
overpressure = "ace_overpressure";
};

1
addons/refuel/config.cpp
View File

@ -21,5 +21,4 @@ class ACE_newEvents {
setFuel = "ace_setFuel";
setVectorDirAndUp = "ace_setVectorDirAndUp";
displayTextStructured = "ace_displayTextStructured";
displayTextStructured = "ace_displayTextStructured";
};

3
addons/reload/config.cpp
View File

@ -25,8 +25,5 @@ class CfgPatches {
class ACE_newEvents {
setAmmoSync = "ace_setAmmoSync";
returnedAmmo = "ace_returnedAmmo";
setAmmoSync = "ace_setAmmoSync";
returnedAmmo = "ace_returnedAmmo";
returnedAmmo = "ace_returnedAmmo";
linkedAmmo = "ace_linkedAmmo";
};

1
addons/reloadlaunchers/config.cpp
View File

@ -19,5 +19,4 @@ class CfgPatches {
class ACE_newEvents {
reloadLauncher = "ace_reloadLauncher";
reloadLauncher = "ace_reloadLauncher";
};

10
addons/repair/config.cpp
View File

@ -24,18 +24,8 @@ class ACE_newEvents {
setVehicleHitPointDamage = "ace_setVehicleHitPointDamage";
setVehicleDamage = "ace_setVehicleDamage";
fixPosition = "ace_fixPosition";
fixCollision = "ace_fixCollision";
displayTextStructured = "ace_displayTextStructured";
displayTextStructured = "ace_displayTextStructured";
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";
AddCargoByClass = "ace_addCargoByClass";
};

2
addons/respawn/config.cpp
View File

@ -23,6 +23,4 @@ class ACE_newEvents {
playerChanged = "ace_playerChanged";
rallypointMoved = "ace_rallypointMoved";
killedByFriendly = "ace_killedByFriendly";
rallypointMoved = "ace_rallypointMoved";
rallypointMoved = "ace_rallypointMoved";
};

1
addons/tagging/config.cpp
View File

@ -17,7 +17,6 @@ class CfgPatches {
#include "CfgWeapons.hpp"
class ACE_newEvents {
createTag = "ace_createTag";
createTag = "ace_createTag";
tagCreated = "ace_tagCreated";
};

2
addons/vector/config.cpp
View File

@ -20,5 +20,5 @@ class CfgPatches {
#include "RscInGameUI.hpp"
class ACE_newEvents {
RangerfinderData = "ace_rangerfinderData";
RangerfinderData = "ace_rangefinderData";
};

2
addons/vector/functions/fnc_dataTransfer.sqf
View File

@ -22,4 +22,4 @@ _direction = call FUNC(getDirection);
_azimuth = _direction select 0;
_inclination = _direction select 1;
//Send Data to connected GPS
["ace_rangerfinderData", [_distance, _azimuth, _inclination]] call CBA_fnc_localEvent;
["ace_rangefinderData", [_distance, _azimuth, _inclination]] call CBA_fnc_localEvent;

3
addons/vehiclelock/config.cpp
View File

@ -22,7 +22,4 @@ class ACE_newEvents {
SettingsInitialized = "ace_settingsInitialized";
VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
VehicleLock_SetupCustomKey = "ace_vehicleLock_SetupCustomKey";
VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
VehicleLock_SetupCustomKey = "ace_vehicleLock_SetupCustomKey";
};

1
addons/weather/config.cpp
View File

@ -18,5 +18,4 @@ class CfgPatches {
#include "ACE_Settings.hpp"
class ACE_newEvents {
SettingsInitialized = "ace_settingsInitialized";
SettingsInitialized = "ace_settingsInitialized";
};

2
addons/zeus/config.cpp
View File

@ -48,6 +48,4 @@ class ACE_newEvents {
SetSurrendered = "ace_setSurrendered";
SetHandcuffed = "ace_setHandcuffed";
AddCargoByClass = "ace_addCargoByClass";
AddCargoByClass = "ace_addCargoByClass";
zeusUnitAssigned = "ace_zeusUnitAssigned";
};