From c4999c13e4d0ddd99c3e741585384c017293bc7d Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 25 May 2016 02:19:50 +0200 Subject: [PATCH] QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus --- addons/sandbag/config.cpp | 1 + addons/tagging/XEH_postInit.sqf | 2 +- addons/tagging/config.cpp | 2 +- addons/tagging/functions/fnc_tag.sqf | 2 +- addons/tripod/config.cpp | 1 + addons/viewdistance/XEH_clientInit.sqf | 4 ++-- addons/weather/config.cpp | 1 + addons/zeus/XEH_preInit.sqf | 2 +- addons/zeus/config.cpp | 2 +- addons/zeus/functions/fnc_bi_moduleCurator.sqf | 2 +- 10 files changed, 11 insertions(+), 8 deletions(-) diff --git a/addons/sandbag/config.cpp b/addons/sandbag/config.cpp index 80938d6ff4..bc59d52a8a 100644 --- a/addons/sandbag/config.cpp +++ b/addons/sandbag/config.cpp @@ -14,6 +14,7 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" + class ACE_newEvents { medical_onUnconscious = "ace_medical_onUnconscious"; playerVehicleChanged = "ace_playerVehicleChanged"; diff --git a/addons/tagging/XEH_postInit.sqf b/addons/tagging/XEH_postInit.sqf index df5d3a1a5b..055cb59cfd 100644 --- a/addons/tagging/XEH_postInit.sqf +++ b/addons/tagging/XEH_postInit.sqf @@ -44,4 +44,4 @@ if (!isServer) exitWith {}; GVAR(testingThread) = false; GVAR(tagsToTest) = []; -["ace_createTag", DFUNC(createTag)] call CBA_fnc_addEventHandler; +[QGVAR(createTag), DFUNC(createTag)] call CBA_fnc_addEventHandler; diff --git a/addons/tagging/config.cpp b/addons/tagging/config.cpp index 96ecadbf03..e494247db3 100644 --- a/addons/tagging/config.cpp +++ b/addons/tagging/config.cpp @@ -17,6 +17,6 @@ class CfgPatches { #include "CfgWeapons.hpp" class ACE_newEvents { - createTag = "ace_createTag"; + createTag = QGVAR(createTag); tagCreated = "ace_tagCreated"; }; diff --git a/addons/tagging/functions/fnc_tag.sqf b/addons/tagging/functions/fnc_tag.sqf index 0cf5336dec..4cdb428f6a 100644 --- a/addons/tagging/functions/fnc_tag.sqf +++ b/addons/tagging/functions/fnc_tag.sqf @@ -109,7 +109,7 @@ _unit playActionNow "PutDown"; playSound3D [QUOTE(PATHTO_R(sounds\spray.ogg)), _unit, false, (eyePos _unit), 10, 1, 15]; // Tell the server to create the tag and handle its destruction - ["ace_createTag", _this] call CBA_fnc_serverEvent; + [QGVAR(createTag), _this] call CBA_fnc_serverEvent; }, [_touchingPoint vectorAdd (_surfaceNormal vectorMultiply 0.06), _vectorDirAndUp, _texture, _object, _unit], 0.6] call EFUNC(common,waitAndExecute); true diff --git a/addons/tripod/config.cpp b/addons/tripod/config.cpp index f57dbb7b9e..c8fca00687 100644 --- a/addons/tripod/config.cpp +++ b/addons/tripod/config.cpp @@ -14,6 +14,7 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" + class ACE_newEvents { medical_onUnconscious = "ace_medical_onUnconscious"; playerVehicleChanged = "ace_playerVehicleChanged"; diff --git a/addons/viewdistance/XEH_clientInit.sqf b/addons/viewdistance/XEH_clientInit.sqf index a1b81a6ddb..2572931935 100644 --- a/addons/viewdistance/XEH_clientInit.sqf +++ b/addons/viewdistance/XEH_clientInit.sqf @@ -10,7 +10,7 @@ if (!hasInterface) exitWith {}; [false] call FUNC(adaptViewDistance); // Set the EH which waits for any of the view distance settings to be changed, so that the effect is show immediately - ["SettingChanged",{ + ["ace_settingChanged",{ params ["_name"]; if ((_name == QGVAR(viewDistanceOnFoot)) || (_name == QGVAR(viewDistanceLandVehicle)) || @@ -23,7 +23,7 @@ if (!hasInterface) exitWith {}; // Set the EH which waits for a vehicle change to automatically swap between On Foot/In Land Vehicle/In Air Vehicle // Also run when SettingsInitialized runs (not guaranteed) - ["playerVehicleChanged",{ + ["ace_playerVehicleChanged",{ [false] call FUNC(adaptViewDistance); }] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler; diff --git a/addons/weather/config.cpp b/addons/weather/config.cpp index 280efd3654..ebe2271670 100644 --- a/addons/weather/config.cpp +++ b/addons/weather/config.cpp @@ -16,6 +16,7 @@ class CfgPatches { #include "RscTitles.hpp" #include "CfgVehicles.hpp" #include "ACE_Settings.hpp" + class ACE_newEvents { SettingsInitialized = "ace_settingsInitialized"; }; diff --git a/addons/zeus/XEH_preInit.sqf b/addons/zeus/XEH_preInit.sqf index 136851458b..b39f4c0e04 100644 --- a/addons/zeus/XEH_preInit.sqf +++ b/addons/zeus/XEH_preInit.sqf @@ -5,7 +5,7 @@ ADDON = false; #include "XEH_PREP.hpp" if (isServer) then { - ["ace_zeusUnitAssigned", FUNC(handleZeusUnitAssigned)] call CBA_fnc_addEventHandler; + [QGVAR(zeusUnitAssigned), FUNC(handleZeusUnitAssigned)] call CBA_fnc_addEventHandler; }; ADDON = true; diff --git a/addons/zeus/config.cpp b/addons/zeus/config.cpp index 0758e1557b..1337d12518 100644 --- a/addons/zeus/config.cpp +++ b/addons/zeus/config.cpp @@ -44,7 +44,7 @@ class ACE_Curator { #include "ACE_Settings.hpp" class ACE_newEvents { - zeusUnitAssigned = "ace_zeusUnitAssigned"; + zeusUnitAssigned = QGVAR(zeusUnitAssigned); SetSurrendered = "ace_setSurrendered"; SetHandcuffed = "ace_setHandcuffed"; AddCargoByClass = "ace_addCargoByClass"; diff --git a/addons/zeus/functions/fnc_bi_moduleCurator.sqf b/addons/zeus/functions/fnc_bi_moduleCurator.sqf index 84c4dd59ec..a86f81930d 100644 --- a/addons/zeus/functions/fnc_bi_moduleCurator.sqf +++ b/addons/zeus/functions/fnc_bi_moduleCurator.sqf @@ -175,7 +175,7 @@ if (_activated) then { [_logic,"curatorUnitAssigned",[_logic,_player]] call bis_fnc_callscriptedeventhandler; // Added by ace_zeus - ["ace_zeusUnitAssigned", [_logic,_player]] call CBA_fnc_globalEvent; + [QGVAR(zeusUnitAssigned), [_logic,_player]] call CBA_fnc_globalEvent; //--- Forced interface //if (_forced) then {