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

QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus

Browse Source
This commit is contained in:
jonpas 2016-05-25 02:19:50 +02:00
parent 7ede53bbdd
commit c4999c13e4
10 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/sandbag/config.cpp
View File

@ -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";

2
addons/tagging/XEH_postInit.sqf
View File

@ -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;

2
addons/tagging/config.cpp
View File

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

2
addons/tagging/functions/fnc_tag.sqf
View File

@ -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

1
addons/tripod/config.cpp
View File

@ -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";

4
addons/viewdistance/XEH_clientInit.sqf
View File

@ -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;

1
addons/weather/config.cpp
View File

@ -16,6 +16,7 @@ class CfgPatches {
#include "RscTitles.hpp"
#include "CfgVehicles.hpp"
#include "ACE_Settings.hpp"
class ACE_newEvents {
SettingsInitialized = "ace_settingsInitialized";
};

2
addons/zeus/XEH_preInit.sqf
View File

@ -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;

2
addons/zeus/config.cpp
View File

@ -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";

2
addons/zeus/functions/fnc_bi_moduleCurator.sqf
View File

@ -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 {