From 9e4fd777456b220d8706dbb4ebccba4366135843 Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Fri, 3 Jun 2016 20:38:16 +0100 Subject: [PATCH] Update common event names to meet new standard --- addons/advanced_ballistics/config.cpp | 3 +-- addons/captives/config.cpp | 2 -- addons/cargo/config.cpp | 1 - addons/cargo/functions/fnc_loadItem.sqf | 2 +- addons/common/XEH_postInit.sqf | 22 ++++++++-------- addons/common/config.cpp | 26 ++++++++++--------- .../fnc__handleRequestAllSyncedEvents.sqf | 2 +- .../fnc__handleRequestSyncedEvent.sqf | 2 +- addons/common/functions/fnc_headBugFix.sqf | 4 +-- addons/common/functions/fnc_hideUnit.sqf | 2 +- .../functions/fnc_requestSyncedEvent.sqf | 4 +-- addons/common/functions/fnc_syncedEvent.sqf | 2 +- addons/common/functions/fnc_unhideUnit.sqf | 2 +- addons/disposable/config.cpp | 3 +-- addons/dragging/config.cpp | 3 --- addons/finger/config.cpp | 4 --- addons/frag/config.cpp | 3 +-- addons/gforces/config.cpp | 4 --- addons/goggles/config.cpp | 3 --- addons/hearing/XEH_postInit.sqf | 4 +-- addons/hearing/config.cpp | 12 --------- addons/interact_menu/config.cpp | 1 - addons/laserpointer/config.cpp | 3 +-- addons/map/config.cpp | 4 --- addons/map_gestures/config.cpp | 4 --- addons/medical/XEH_postInit.sqf | 4 +-- addons/medical/config.cpp | 2 +- .../functions/fnc_actionPlaceInBodyBag.sqf | 2 +- .../functions/fnc_serverRemoveBody.sqf | 2 +- addons/mk6mortar/XEH_postInit.sqf | 4 +-- addons/mk6mortar/config.cpp | 1 - addons/modules/XEH_postInit.sqf | 2 +- addons/modules/config.cpp | 4 --- addons/movement/config.cpp | 5 ---- addons/nametags/config.cpp | 4 --- addons/nightvision/config.cpp | 6 +---- addons/noradio/XEH_postInit.sqf | 2 +- addons/optionsmenu/config.cpp | 4 --- addons/overheating/config.cpp | 1 - addons/parachute/config.cpp | 4 +-- addons/rearm/config.cpp | 1 - addons/respawn/config.cpp | 2 -- addons/sandbag/config.cpp | 4 --- addons/sandbag/functions/fnc_deploy.sqf | 2 +- addons/scopes/config.cpp | 2 -- addons/sitting/config.cpp | 3 +-- addons/tacticalladder/config.cpp | 2 -- addons/trenches/config.cpp | 4 --- addons/trenches/functions/fnc_placeTrench.sqf | 2 +- addons/tripod/config.cpp | 2 -- addons/ui/config.cpp | 4 --- addons/vehiclelock/config.cpp | 1 - addons/viewdistance/config.cpp | 4 --- addons/weaponselect/config.cpp | 1 - .../fnc_displayGrenadeTypeAndNumber.sqf | 2 +- addons/weather/config.cpp | 4 --- addons/winddeflection/config.cpp | 1 - 57 files changed, 56 insertions(+), 154 deletions(-) diff --git a/addons/advanced_ballistics/config.cpp b/addons/advanced_ballistics/config.cpp index 84557517d2..961a4a1b07 100644 --- a/addons/advanced_ballistics/config.cpp +++ b/addons/advanced_ballistics/config.cpp @@ -23,7 +23,6 @@ class ACE_Extensions { }; class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; firedPlayerNonLocal = "ace_firedPlayerNonLocal"; firedPlayer = "ace_firedPlayer"; -}; \ No newline at end of file +}; diff --git a/addons/captives/config.cpp b/addons/captives/config.cpp index eb8066ed82..c2faedb7c0 100644 --- a/addons/captives/config.cpp +++ b/addons/captives/config.cpp @@ -21,12 +21,10 @@ class CfgPatches { #include "CfgEden.hpp" class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; medical_onUnconscious = "ace_unconscious"; SetSurrendered = QGVAR(setSurrendered); SetHandcuffed = QGVAR(setHandcuffed); MoveOutCaptive = QGVAR(moveOutCaptive); MoveInCaptive = QGVAR(moveInCaptive); - playerChanged = "ace_playerChanged"; CaptiveStatusChanged = "ace_captiveStatusChanged"; }; diff --git a/addons/cargo/config.cpp b/addons/cargo/config.cpp index 48642639cc..450b2b5e25 100644 --- a/addons/cargo/config.cpp +++ b/addons/cargo/config.cpp @@ -26,6 +26,5 @@ class ACE_newEvents { AddCargoByClass = "ace_addCargoByClass"; ServerUnloadCargo = QGVAR(serverUnload); UnloadCargo = "ace_unloadCargo"; - hideObjectGlobal = "ace_hideObjectGlobal"; cargoAddedByClass = "ace_cargoAddedByClass"; }; diff --git a/addons/cargo/functions/fnc_loadItem.sqf b/addons/cargo/functions/fnc_loadItem.sqf index 36261e05b7..6e9bf4cc9d 100644 --- a/addons/cargo/functions/fnc_loadItem.sqf +++ b/addons/cargo/functions/fnc_loadItem.sqf @@ -35,7 +35,7 @@ _vehicle setVariable [QGVAR(space), _space - _itemSize, true]; if (_item isEqualType objNull) then { detach _item; _item attachTo [_vehicle,[0,0,-100]]; - ["ace_hideObjectGlobal", [_item, true]] call CBA_fnc_serverEvent; + [QEGVAR(common,hideObjectGlobal), [_item, true]] call CBA_fnc_serverEvent; }; true diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 56cb75bb10..1408357086 100644 --- a/addons/common/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -89,7 +89,7 @@ if (isServer) then { // Event to log Fix Headbug output -["HeadbugFixUsed", { +[QGVAR(headbugFixUsed), { params ["_profileName", "_animation"]; ACE_LOGINFO_2("Headbug Used: Name: %1, Animation: %2",_profileName,_animation); }] call CBA_fnc_addEventHandler; @@ -129,8 +129,8 @@ if (isServer) then { [QGVAR(systemChatGlobal), {systemChat _this}] call CBA_fnc_addEventHandler; if (isServer) then { - ["ace_hideObjectGlobal", {(_this select 0) hideObjectGlobal (_this select 1)}] call CBA_fnc_addEventHandler; - ["ace_enableSimulationGlobal", {(_this select 0) enableSimulationGlobal (_this select 1)}] call CBA_fnc_addEventHandler; + [QGVAR(hideObjectGlobal), {(_this select 0) hideObjectGlobal (_this select 1)}] call CBA_fnc_addEventHandler; + [QGVAR(enableSimulationGlobal), {(_this select 0) enableSimulationGlobal (_this select 1)}] call CBA_fnc_addEventHandler; ["ace_setOwner", {(_this select 0) setOwner (_this select 1)}] call CBA_fnc_addEventHandler; [QGVAR(serverLog), FUNC(serverLog)] call CBA_fnc_addEventHandler; }; @@ -143,16 +143,16 @@ if (isServer) then { // Synced ACE events // Handle JIP scenario if (!isServer) then { - ["PlayerJip", { + ["ace_playerJIP", { ACE_LOGINFO("JIP event synchronization initialized"); - ["ace_SEH_all", [player]] call CBA_fnc_serverEvent; + [QGVAR(SEH_all), [player]] call CBA_fnc_serverEvent; }] call CBA_fnc_addEventHandler; } else { - ["ace_SEH_all", FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler; + [QGVAR(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; +[QGVAR(SEH), FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler; +[QGVAR(SEH_s), FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler; if (isServer) then { [FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler; @@ -221,7 +221,7 @@ call FUNC(checkFiles); [] call FUNC(readSettingsFromParamsArray); }; // Event so that ACE_Modules have their settings loaded: - ["ace_initSettingsFromModules", []] call CBA_fnc_localEvent; + [QGVAR(initSettingsFromModules), []] call CBA_fnc_localEvent; if (isServer) then { // Publish all settings data after all configs and modules are read @@ -284,7 +284,7 @@ enableCamShake true; ////////////////////////////////////////////////// // Set the name for the current player -["playerChanged", { +["ace_playerChanged", { params ["_newPlayer","_oldPlayer"]; if (alive _newPlayer) then { @@ -475,7 +475,7 @@ if (didJip) then { // We are jipping! Get ready and wait, and throw the event [{ if(!isNull player && GVAR(settingsInitFinished)) then { - ["ace_playerJip", [player]] call CBA_fnc_localEvent; + ["ace_playerJIP", [player]] call CBA_fnc_localEvent; [_this select 1] call CBA_fnc_removePerFrameHandler; }; }, 0, []] call CBA_fnc_addPerFrameHandler; diff --git a/addons/common/config.cpp b/addons/common/config.cpp index 8803c751ba..a4d7789e1a 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -21,9 +21,7 @@ class ACE_newEvents { blockDamage = QGVAR(blockDamage); blockEngine = QGVAR(blockEngine); - useItem = "ace_useItem"; - displayTextPicture = "ace_displayTextPicture"; - displayTextStructured = "ace_displayTextStructured"; + PlayerJip = "ace_playerJIP"; activeCameraChanged = "ace_activeCameraChanged"; visibleMapChanged = "ace_visibleMapChanged"; cameraViewChanged = "ace_cameraViewChanged"; @@ -34,12 +32,19 @@ class ACE_newEvents { playerVehicleChanged = "ace_playerVehicleChanged"; playerChanged = "ace_playerChanged"; SettingsInitialized = "ace_settingsInitialized"; - InitSettingsFromModules = "ace_initSettingsFromModules"; - SEH_s = "ace_SEH_s"; - SEH = "ace_SEH"; - SEH_all = "ace_SEH_all"; - enableSimulationGlobal = "ace_enableSimulationGlobal"; - hideObjectGlobal = "ace_hideObjectGlobal"; + + SEH_s = QGVAR(SEH_s); + SEH = QGVAR(SEH); + SEH_all = QGVAR(SEH_all); + 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"; @@ -56,10 +61,7 @@ class ACE_newEvents { fixPosition = "ace_fixPosition"; fixFloating = "ace_fixFloating"; fixCollision = "ace_fixCollision"; - setStatusEffect = QGVAR(setStatusEffect); SettingChanged = "ace_settingChanged"; - HeadbugFixUsed = "ace_headbugFixUsed"; - blockDamage = "ace_blockDamage"; firedNonPlayerVehicle = "ace_firedNonPlayerVehicle"; firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal"; firedPlayerVehicle = "ace_firedPlayerVehicle"; diff --git a/addons/common/functions/fnc__handleRequestAllSyncedEvents.sqf b/addons/common/functions/fnc__handleRequestAllSyncedEvents.sqf index 5c95d7c030..4a599f2d7e 100644 --- a/addons/common/functions/fnc__handleRequestAllSyncedEvents.sqf +++ b/addons/common/functions/fnc__handleRequestAllSyncedEvents.sqf @@ -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; + [QGVAR(SEH_s), [_x, _eventLog], _client] call CBA_fnc_targetEvent; false } count (GVAR(syncedEvents) select 0); diff --git a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf index ed55997baa..40d60aedef 100644 --- a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf +++ b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf @@ -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; + [QGVAR(SEH_s), [_eventName, _eventLog], _client] call CBA_fnc_targetEvent; } else { params ["_eventName", "_eventLog"]; diff --git a/addons/common/functions/fnc_headBugFix.sqf b/addons/common/functions/fnc_headBugFix.sqf index b5a1fc0d39..07a1652b1b 100644 --- a/addons/common/functions/fnc_headBugFix.sqf +++ b/addons/common/functions/fnc_headBugFix.sqf @@ -17,8 +17,8 @@ private _unit = ACE_player; private _anim = animationState _unit; -["ace_headbugFixUsed", [profileName, _anim]] call CBA_fnc_serverEvent; -["ace_headbugFixUsed", [profileName, _anim]] call CBA_fnc_localEvent; +[QGVAR(headbugFixUsed), [profileName, _anim]] call CBA_fnc_serverEvent; +[QGVAR(headbugFixUsed), [profileName, _anim]] call CBA_fnc_localEvent; if (_unit != vehicle _unit || {!([_unit, objNull, ["isNotSitting"]] call FUNC(canInteractWith))}) exitWith {false}; diff --git a/addons/common/functions/fnc_hideUnit.sqf b/addons/common/functions/fnc_hideUnit.sqf index 58b5dc2e2c..e0adb201c3 100644 --- a/addons/common/functions/fnc_hideUnit.sqf +++ b/addons/common/functions/fnc_hideUnit.sqf @@ -28,5 +28,5 @@ if !(_reason in _setHiddenReasons) then { }; if !(isObjectHidden _unit) then { - ["ace_hideObjectGlobal", [_unit, true]] call CBA_fnc_serverEvent; + [QGVAR(hideObjectGlobal), [_unit, true]] call CBA_fnc_serverEvent; }; diff --git a/addons/common/functions/fnc_requestSyncedEvent.sqf b/addons/common/functions/fnc_requestSyncedEvent.sqf index 5527030764..08423ad40d 100644 --- a/addons/common/functions/fnc_requestSyncedEvent.sqf +++ b/addons/common/functions/fnc_requestSyncedEvent.sqf @@ -4,7 +4,7 @@ * * Arguments: * 0: eventName - * + * * Return Value: * Boolean of success * @@ -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; +[QGVAR(SEH_s), [_eventName, ACE_player]] call CBA_fnc_serverEvent; diff --git a/addons/common/functions/fnc_syncedEvent.sqf b/addons/common/functions/fnc_syncedEvent.sqf index 08734463be..c36c519f6d 100644 --- a/addons/common/functions/fnc_syncedEvent.sqf +++ b/addons/common/functions/fnc_syncedEvent.sqf @@ -23,4 +23,4 @@ if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith { private _eventData = [_name, _args, _ttl]; -["ace_SEH", _eventData] call CBA_fnc_globalEvent; +[QGVAR(SEH), _eventData] call CBA_fnc_globalEvent; diff --git a/addons/common/functions/fnc_unhideUnit.sqf b/addons/common/functions/fnc_unhideUnit.sqf index f2e8608ec5..cb988cde1b 100644 --- a/addons/common/functions/fnc_unhideUnit.sqf +++ b/addons/common/functions/fnc_unhideUnit.sqf @@ -28,5 +28,5 @@ if (_reason in _setHiddenReasons) then { }; if (_setHiddenReasons isEqualTo []) then { - ["ace_hideObjectGlobal", [_unit,false]] call CBA_fnc_serverEvent; + [QGVAR(hideObjectGlobal), [_unit,false]] call CBA_fnc_serverEvent; }; diff --git a/addons/disposable/config.cpp b/addons/disposable/config.cpp index f73bd843a6..1f87c85c28 100644 --- a/addons/disposable/config.cpp +++ b/addons/disposable/config.cpp @@ -19,7 +19,6 @@ class CfgPatches { #include "CfgVehicles.hpp" class ACE_newEvents { - playerInventoryChanged = "ace_playerInventoryChanged"; firedNonPlayer = "ace_firedNonPlayer"; firedPlayer = "ace_firedPlayer"; -}; \ No newline at end of file +}; diff --git a/addons/dragging/config.cpp b/addons/dragging/config.cpp index dfc8a7fbf6..48d72c5106 100644 --- a/addons/dragging/config.cpp +++ b/addons/dragging/config.cpp @@ -19,9 +19,6 @@ class CfgPatches { class ACE_newEvents { medical_onUnconscious = "ace_unconscious"; - playerWeaponChanged = "ace_playerWeaponChanged"; - playerVehicleChanged = "ace_playerVehicleChanged"; - playerChanged = "ace_playerChanged"; setDir = "ace_setDir"; fixFloating = "ace_fixFloating"; fixPosition = "ace_fixPosition"; diff --git a/addons/finger/config.cpp b/addons/finger/config.cpp index 9621006dfd..12e48da03e 100644 --- a/addons/finger/config.cpp +++ b/addons/finger/config.cpp @@ -17,7 +17,3 @@ class CfgPatches { #include "ACE_Settings.hpp" #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" - -class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; -}; \ No newline at end of file diff --git a/addons/frag/config.cpp b/addons/frag/config.cpp index 6df989e1a8..84fe7249b4 100644 --- a/addons/frag/config.cpp +++ b/addons/frag/config.cpp @@ -16,11 +16,10 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "ACE_Settings.hpp" class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; firedNonPlayerVehicle = "ace_firedNonPlayerVehicle"; firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal"; firedPlayerVehicle = "ace_firedPlayerVehicle"; firedNonPlayer = "ace_firedNonPlayer"; firedPlayerNonLocal = "ace_firedPlayerNonLocal"; firedPlayer = "ace_firedPlayer"; -}; \ No newline at end of file +}; diff --git a/addons/gforces/config.cpp b/addons/gforces/config.cpp index db3a9a58fd..58f11020eb 100644 --- a/addons/gforces/config.cpp +++ b/addons/gforces/config.cpp @@ -17,7 +17,3 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgWeapons.hpp" #include "CfgVehicles.hpp" - -class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; -}; \ No newline at end of file diff --git a/addons/goggles/config.cpp b/addons/goggles/config.cpp index f3e837177a..d3d1f6189f 100644 --- a/addons/goggles/config.cpp +++ b/addons/goggles/config.cpp @@ -271,10 +271,7 @@ class CfgCloudlets { }; class ACE_newEvents { - playerInventoryChanged = "ace_playerInventoryChanged"; firedPlayer = "ace_firedPlayer"; - activeCameraChanged = "ace_activeCameraChanged"; - cameraViewChanged = "ace_cameraViewChanged"; GlassesChanged = "ace_glassesChanged"; GlassesCracked = "ace_glassesCracked"; }; diff --git a/addons/hearing/XEH_postInit.sqf b/addons/hearing/XEH_postInit.sqf index 5f92b239bb..cdf2e6d74b 100644 --- a/addons/hearing/XEH_postInit.sqf +++ b/addons/hearing/XEH_postInit.sqf @@ -28,8 +28,8 @@ GVAR(volumeAttenuation) = 1; [FUNC(updateVolume), 1, [false]] call CBA_fnc_addPerFrameHandler; // Update veh attunation when player veh changes - ["ace_playerVehicleChanged", {_this call FUNC(updatePlayerVehAttenuation);}] call CBA_fnc_addEventHandler; - ["ace_playerTurretChanged", {_this call FUNC(updatePlayerVehAttenuation);}] call CBA_fnc_addEventHandler; + ["ace_playerVehicleChanged", FUNC(updatePlayerVehAttenuation)] call CBA_fnc_addEventHandler; + ["ace_playerTurretChanged", FUNC(updatePlayerVehAttenuation)] call CBA_fnc_addEventHandler; // Reset deafness on respawn (or remote control player switch) ["ace_playerChanged", { diff --git a/addons/hearing/config.cpp b/addons/hearing/config.cpp index ac8ff8f4b2..455bc20dd1 100644 --- a/addons/hearing/config.cpp +++ b/addons/hearing/config.cpp @@ -14,20 +14,8 @@ class CfgPatches { }; #include "CfgEventHandlers.hpp" - #include "CfgVehicles.hpp" - #include "CfgSounds.hpp" - #include "CfgWeapons.hpp" - #include "CfgAmmo.hpp" - #include "ACE_Settings.hpp" - -class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; - playerInventoryChanged = "ace_playerInventoryChanged"; - playerTurretChanged = "ace_playerTurretChanged"; - playerVehicleChanged = "ace_playerVehicleChanged"; -}; diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index 4ab562956c..3ad5316b38 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -27,7 +27,6 @@ class ACE_Extensions { class ACE_newEvents { SettingChanged = "ace_settingChanged"; - playerChanged = "ace_playerChanged"; interactMenuOpened = "ace_interactMenuOpened"; clearConditionCaches = QGVAR(clearConditionCaches); interactMenuClosed = "ace_interactMenuClosed"; diff --git a/addons/laserpointer/config.cpp b/addons/laserpointer/config.cpp index 3d41c803a3..c727bc6407 100644 --- a/addons/laserpointer/config.cpp +++ b/addons/laserpointer/config.cpp @@ -21,6 +21,5 @@ class CfgPatches { class ACE_newEvents { GunLightOff = "ace_gunLightOff"; - SettingsInitialized = "ace_settingsInitialized"; SetHandcuffed = QEGVAR(captives,setHandcuffed); -}; \ No newline at end of file +}; diff --git a/addons/map/config.cpp b/addons/map/config.cpp index f7c4101218..17e9aae0ab 100644 --- a/addons/map/config.cpp +++ b/addons/map/config.cpp @@ -164,7 +164,3 @@ class RscDisplayServerGetReady: RscDisplayGetReady { }; }; }; - -class ACE_newEvents { - visibleMapChanged = "ace_visibleMapChanged"; -}; diff --git a/addons/map_gestures/config.cpp b/addons/map_gestures/config.cpp index 8c25ee34a7..52f333c717 100644 --- a/addons/map_gestures/config.cpp +++ b/addons/map_gestures/config.cpp @@ -16,7 +16,3 @@ class CfgPatches { #include "ACE_Settings.hpp" #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" - -class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; -}; \ No newline at end of file diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index 404c6746f1..194292de27 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -29,7 +29,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"]; [QGVAR(actionPlaceInBodyBag), FUNC(actionPlaceInBodyBag)] call CBA_fnc_addEventHandler; //Handle Deleting Bodies on Server: -if (isServer) then {["ace_playedInBodyBag", FUNC(serverRemoveBody)] call CBA_fnc_addEventHandler;}; +if (isServer) then {["ace_placedInBodyBag", FUNC(serverRemoveBody)] call CBA_fnc_addEventHandler;}; ["ace_unconscious", { params ["_unit", "_status"]; @@ -295,7 +295,7 @@ GVAR(lastHeartBeatSound) = CBA_missionTime; ["ace_playerInventoryChanged", FUNC(itemCheck)] call CBA_fnc_addEventHandler; if (hasInterface) then { - ["PlayerJip", { + ["ace_playerJIP", { ACE_LOGINFO("JIP Medical init for player."); [player] call FUNC(init); }] call CBA_fnc_addEventHandler; diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp index bda657960b..27aacb04e7 100644 --- a/addons/medical/config.cpp +++ b/addons/medical/config.cpp @@ -33,7 +33,7 @@ class ACE_newEvents { Medical_onItemAddedToTriageCard = "ace_itemAddedToTriageCard"; medical_onLogEntryAdded = "ace_medicalLogEntryAdded"; Medical_onHeartRateAdjustmentAdded = "ace_addedHeartRateAdjustment"; - placedInBodyBag = "ace_playedInBodyBag"; + placedInBodyBag = "ace_placedInBodyBag"; actionPlaceInBodyBag = QGVAR(actionPlaceInBodyBag); treatmentTourniquetLocal = QGVAR(treatmentTourniquetLocal); treatmentIVLocal = QGVAR(treatmentIVLocal); diff --git a/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf b/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf index 35d283c925..1ae1dfdc6d 100644 --- a/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf +++ b/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf @@ -47,6 +47,6 @@ private _bodyBag = createVehicle ["ACE_bodyBagObject", _position, [], 0, ""]; _bodyBag setPosASL _position; _bodyBag setDir _direction; -["ace_playedInBodyBag", [_target, _bodyBag]] call CBA_fnc_globalEvent; //hide and delete body on server +["ace_placedInBodyBag", [_target, _bodyBag]] call CBA_fnc_globalEvent; //hide and delete body on server _bodyBag diff --git a/addons/medical/functions/fnc_serverRemoveBody.sqf b/addons/medical/functions/fnc_serverRemoveBody.sqf index c37d14cde8..42e755f003 100644 --- a/addons/medical/functions/fnc_serverRemoveBody.sqf +++ b/addons/medical/functions/fnc_serverRemoveBody.sqf @@ -21,7 +21,7 @@ params ["_target"]; TRACE_2("",_target,isPlayer _target); //Hide the body globaly -["ace_hideObjectGlobal", [_target, true]] call CBA_fnc_serverEvent; +[QEGVAR(common,hideObjectGlobal), [_target, true]] call CBA_fnc_serverEvent; if (isNil QGVAR(bodiesToDelete)) then {GVAR(bodiesToDelete) = [];}; GVAR(bodiesToDelete) pushBack _target; diff --git a/addons/mk6mortar/XEH_postInit.sqf b/addons/mk6mortar/XEH_postInit.sqf index c5bcf134ac..594b0cc231 100644 --- a/addons/mk6mortar/XEH_postInit.sqf +++ b/addons/mk6mortar/XEH_postInit.sqf @@ -19,5 +19,5 @@ if (!hasInterface) exitWith {}; -["ace_playerVehicleChanged", {_this call FUNC(handlePlayerVehicleChanged);}] call CBA_fnc_addEventHandler; -["ace_infoDisplayChanged", {_this call FUNC(turretDisplayLoaded);}] call CBA_fnc_addEventHandler; +["ace_playerVehicleChanged", FUNC(handlePlayerVehicleChanged)] call CBA_fnc_addEventHandler; +["ace_infoDisplayChanged", FUNC(turretDisplayLoaded)] call CBA_fnc_addEventHandler; diff --git a/addons/mk6mortar/config.cpp b/addons/mk6mortar/config.cpp index 509bea599c..e13d26588b 100644 --- a/addons/mk6mortar/config.cpp +++ b/addons/mk6mortar/config.cpp @@ -36,6 +36,5 @@ class RscStructuredText; class ACE_newEvents { infoDisplayChanged = "ace_infoDisplayChanged"; - playerVehicleChanged = "ace_playerVehicleChanged"; initMortar = "ace_initMortar"; }; diff --git a/addons/modules/XEH_postInit.sqf b/addons/modules/XEH_postInit.sqf index 8eabe08f0d..293b946897 100644 --- a/addons/modules/XEH_postInit.sqf +++ b/addons/modules/XEH_postInit.sqf @@ -1,7 +1,7 @@ #include "script_component.hpp" -["ace_initSettingsFromModules", { +[QEGVAR(common,initSettingsFromModules), { // TODO This is a basic and limited implementation that mimics some of the functionality from the A3 module framework, but not all of it. // We have to execute this in the postInit XEH because on object init, the parameters of the modules are not yet available. They are if we execute it at the start of postInit execution. diff --git a/addons/modules/config.cpp b/addons/modules/config.cpp index c35dd623ba..543bbe2551 100644 --- a/addons/modules/config.cpp +++ b/addons/modules/config.cpp @@ -27,7 +27,3 @@ class CfgVehicles { }; #include "CfgEventHandlers.hpp" - -class ACE_newEvents { - InitSettingsFromModules = "ace_initSettingsFromModules"; -}; diff --git a/addons/movement/config.cpp b/addons/movement/config.cpp index 49dbd45277..a1d9b25be4 100644 --- a/addons/movement/config.cpp +++ b/addons/movement/config.cpp @@ -19,8 +19,3 @@ class CfgPatches { #include "CfgMoves.hpp" #include "CfgVehicles.hpp" #include "ACE_Settings.hpp" - -class ACE_newEvents { - playerInventoryChanged = "ace_playerInventoryChanged"; - playerChanged = "ace_playerChanged"; -}; \ No newline at end of file diff --git a/addons/nametags/config.cpp b/addons/nametags/config.cpp index 5fa6cde85a..b02dfa9297 100644 --- a/addons/nametags/config.cpp +++ b/addons/nametags/config.cpp @@ -18,7 +18,3 @@ class CfgPatches { #include "CfgVehicles.hpp" #include - -class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; -}; \ No newline at end of file diff --git a/addons/nightvision/config.cpp b/addons/nightvision/config.cpp index 5d2be0963e..0bb7c9227b 100644 --- a/addons/nightvision/config.cpp +++ b/addons/nightvision/config.cpp @@ -19,10 +19,6 @@ class CfgPatches { #include "ACE_Settings.hpp" class ACE_newEvents { - playerVisionModeChanged = "ace_playerVisionModeChanged"; firedPlayerVehicle = "ace_firedPlayerVehicle"; firedPlayer = "ace_firedPlayer"; - playerTurretChanged = "ace_playerTurretChanged"; - playerVehicleChanged = "ace_playerVehicleChanged"; - playerInventoryChanged = "ace_playerInventoryChanged"; -}; \ No newline at end of file +}; diff --git a/addons/noradio/XEH_postInit.sqf b/addons/noradio/XEH_postInit.sqf index 8396a00b8e..1606c674a9 100644 --- a/addons/noradio/XEH_postInit.sqf +++ b/addons/noradio/XEH_postInit.sqf @@ -11,7 +11,7 @@ if (isServer) then { if (!hasInterface) exitWith {}; // mutes/unmutes units when the player changes -["playerChanged", { +["ace_playerChanged", { params ["_newPlayer", "_oldPlayer"]; // mute the new player diff --git a/addons/optionsmenu/config.cpp b/addons/optionsmenu/config.cpp index 34be3b876d..0e564535b9 100644 --- a/addons/optionsmenu/config.cpp +++ b/addons/optionsmenu/config.cpp @@ -40,7 +40,3 @@ class CfgCommands { "http://ace3mod.com/version.html" }; }; - -class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; -}; \ No newline at end of file diff --git a/addons/overheating/config.cpp b/addons/overheating/config.cpp index 11837b7db7..863e3e01d3 100644 --- a/addons/overheating/config.cpp +++ b/addons/overheating/config.cpp @@ -52,7 +52,6 @@ class CfgGesturesMale { }; }; class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted); showWeaponTemperature = QGVAR(showWeaponTemperature); firedPlayerNonLocal = "ace_firedPlayerNonLocal"; diff --git a/addons/parachute/config.cpp b/addons/parachute/config.cpp index a80edfcc99..5eb109ae94 100644 --- a/addons/parachute/config.cpp +++ b/addons/parachute/config.cpp @@ -19,7 +19,5 @@ class CfgPatches { #include "RscTitles.hpp" class ACE_newEvents { - playerVehicleChanged = "ace_playerVehicleChanged"; - playerInventoryChanged = "ace_playerInventoryChanged"; infoDisplayChanged = "ace_infoDisplayChanged"; -}; \ No newline at end of file +}; diff --git a/addons/rearm/config.cpp b/addons/rearm/config.cpp index be579f56fd..76ec880db7 100644 --- a/addons/rearm/config.cpp +++ b/addons/rearm/config.cpp @@ -21,6 +21,5 @@ class CfgPatches { #include "CfgVehicles.hpp" class ACE_newEvents { - playerVehicleChanged = "ace_playerVehicleChanged"; medical_onUnconscious = "ace_unconscious"; }; diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp index 7133a361d7..3a887b48b2 100644 --- a/addons/respawn/config.cpp +++ b/addons/respawn/config.cpp @@ -20,8 +20,6 @@ class CfgPatches { #include "ACE_Settings.hpp" class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; - playerChanged = "ace_playerChanged"; rallypointMoved = "ace_rallypointMoved"; killedByFriendly = "ace_killedByFriendly"; }; diff --git a/addons/sandbag/config.cpp b/addons/sandbag/config.cpp index 1303b09ad0..55e88aef6c 100644 --- a/addons/sandbag/config.cpp +++ b/addons/sandbag/config.cpp @@ -19,9 +19,5 @@ class CfgPatches { class ACE_newEvents { medical_onUnconscious = "ace_unconscious"; - playerVehicleChanged = "ace_playerVehicleChanged"; - playerInventoryChanged = "ace_playerInventoryChanged"; - playerChanged = "ace_playerChanged"; interactMenuOpened = "ace_interactMenuOpened"; - enableSimulationGlobal = "ace_enableSimulationGlobal"; }; diff --git a/addons/sandbag/functions/fnc_deploy.sqf b/addons/sandbag/functions/fnc_deploy.sqf index ca81929a78..0cbe0c5012 100644 --- a/addons/sandbag/functions/fnc_deploy.sqf +++ b/addons/sandbag/functions/fnc_deploy.sqf @@ -27,7 +27,7 @@ _sandBag = createVehicle ["ACE_SandbagObject_NoGeo", [0, 0, 0], [], 0, "NONE"]; GVAR(sandBag) = _sandBag; // prevent collisions with sandbag -["ace_enableSimulationGlobal", [_sandBag, false]] call CBA_fnc_serverEvent; +[QEGVAR(common,enableSimulationGlobal), [_sandBag, false]] call CBA_fnc_serverEvent; GVAR(deployDirection) = 0; diff --git a/addons/scopes/config.cpp b/addons/scopes/config.cpp index 07b820f176..8a2e720283 100644 --- a/addons/scopes/config.cpp +++ b/addons/scopes/config.cpp @@ -24,8 +24,6 @@ class CfgPatches { #include "RscTitles.hpp" class ACE_newEvents { - cameraViewChanged = "ace_cameraViewChanged"; firedPlayerNonLocal = "ace_firedPlayerNonLocal"; firedPlayer = "ace_firedPlayer"; - playerInventoryChanged = "ace_playerInventoryChanged"; }; diff --git a/addons/sitting/config.cpp b/addons/sitting/config.cpp index d48a8f9fb9..88db8f5262 100644 --- a/addons/sitting/config.cpp +++ b/addons/sitting/config.cpp @@ -19,7 +19,6 @@ class CfgPatches { #include "CfgVehicles.hpp" class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; SetHandcuffed = QEGVAR(captives,setHandcuffed); medical_onUnconscious = "ace_unconscious"; -}; \ No newline at end of file +}; diff --git a/addons/tacticalladder/config.cpp b/addons/tacticalladder/config.cpp index 46be014d6a..b2e3405249 100644 --- a/addons/tacticalladder/config.cpp +++ b/addons/tacticalladder/config.cpp @@ -19,6 +19,4 @@ class CfgPatches { class ACE_newEvents { interactMenuOpened = "ace_interactMenuOpened"; medical_onUnconscious = "ace_unconscious"; - playerVehicleChanged = "ace_playerVehicleChanged"; - playerChanged = "ace_playerChanged"; }; diff --git a/addons/trenches/config.cpp b/addons/trenches/config.cpp index 0e689502a6..b1ca0fc0bb 100644 --- a/addons/trenches/config.cpp +++ b/addons/trenches/config.cpp @@ -19,9 +19,5 @@ class CfgPatches { class ACE_newEvents { medical_onUnconscious = "ace_unconscious"; - playerVehicleChanged = "ace_playerVehicleChanged"; - playerInventoryChanged = "ace_playerInventoryChanged"; - playerChanged = "ace_playerChanged"; interactMenuOpened = "ace_interactMenuOpened"; - enableSimulationGlobal = "ace_enableSimulationGlobal"; }; diff --git a/addons/trenches/functions/fnc_placeTrench.sqf b/addons/trenches/functions/fnc_placeTrench.sqf index 9a51e43b67..f7a643d882 100644 --- a/addons/trenches/functions/fnc_placeTrench.sqf +++ b/addons/trenches/functions/fnc_placeTrench.sqf @@ -36,7 +36,7 @@ _trench = createVehicle [_noGeoModel, [0, 0, 0], [], 0, "NONE"]; GVAR(trench) = _trench; // prevent collisions with trench -["ace_enableSimulationGlobal", [_trench, false]] call CBA_fnc_serverEvent; +[QEGVAR(common,enableSimulationGlobal), [_trench, false]] call CBA_fnc_serverEvent; GVAR(digDirection) = 0; diff --git a/addons/tripod/config.cpp b/addons/tripod/config.cpp index 6c18a663bc..7e4e556070 100644 --- a/addons/tripod/config.cpp +++ b/addons/tripod/config.cpp @@ -19,7 +19,5 @@ class CfgPatches { class ACE_newEvents { medical_onUnconscious = "ace_unconscious"; - playerVehicleChanged = "ace_playerVehicleChanged"; - playerChanged = "ace_playerChanged"; interactMenuOpened = "ace_interactMenuOpened"; }; diff --git a/addons/ui/config.cpp b/addons/ui/config.cpp index 339bc52e5c..0b680ca136 100644 --- a/addons/ui/config.cpp +++ b/addons/ui/config.cpp @@ -20,7 +20,3 @@ class CfgPatches { #include "RscChat.hpp" #include "RscVignette.hpp" - -class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; -}; diff --git a/addons/vehiclelock/config.cpp b/addons/vehiclelock/config.cpp index 1180cd8aab..cb67bca1c3 100644 --- a/addons/vehiclelock/config.cpp +++ b/addons/vehiclelock/config.cpp @@ -21,7 +21,6 @@ class CfgPatches { #include "CfgWeapons.hpp" class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; VehicleLock_SetVehicleLock = QGVAR(setVehicleLock); VehicleLock_SetupCustomKey = QGVAR(setupCustomKey); }; diff --git a/addons/viewdistance/config.cpp b/addons/viewdistance/config.cpp index 92dacefcf1..bf3dd29d24 100644 --- a/addons/viewdistance/config.cpp +++ b/addons/viewdistance/config.cpp @@ -16,7 +16,3 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "ACE_Settings.hpp" #include "CfgVehicles.hpp" - -class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; -}; diff --git a/addons/weaponselect/config.cpp b/addons/weaponselect/config.cpp index 94c51a118c..2bc7e843f8 100644 --- a/addons/weaponselect/config.cpp +++ b/addons/weaponselect/config.cpp @@ -18,5 +18,4 @@ class CfgPatches { class ACE_newEvents { firedPlayer = "ace_firedPlayer"; - displayTextPicture = "ace_displayTextPicture"; }; diff --git a/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf b/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf index 5a6697cabc..288531df2c 100644 --- a/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf +++ b/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf @@ -26,4 +26,4 @@ private _name = getText (configFile >> "CfgMagazines" >> _magazine >> "displayNa private _text = [format ["%1 x%2", _name, _numberofGrenades], _color] call EFUNC(common,stringToColoredText); private _picture = getText (configFile >> "CfgMagazines" >> _magazine >> "picture"); -["ace_displayTextPicture", [_text, _picture]] call CBA_fnc_localEvent; +[_text, _picture] call EFUNC(common,displayTextPicture); diff --git a/addons/weather/config.cpp b/addons/weather/config.cpp index b0eff243cb..2444064f41 100644 --- a/addons/weather/config.cpp +++ b/addons/weather/config.cpp @@ -18,7 +18,3 @@ class CfgPatches { #include "RscTitles.hpp" #include "CfgVehicles.hpp" #include "ACE_Settings.hpp" - -class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; -}; diff --git a/addons/winddeflection/config.cpp b/addons/winddeflection/config.cpp index f400f2eb12..f49a9e11bf 100644 --- a/addons/winddeflection/config.cpp +++ b/addons/winddeflection/config.cpp @@ -26,7 +26,6 @@ class CfgAddons { #include "ACE_Settings.hpp" class ACE_newEvents { - SettingsInitialized = "ace_settingsInitialized"; firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal"; firedPlayerVehicle = "ace_firedPlayerVehicle"; firedPlayerNonLocal = "ace_firedPlayerNonLocal";