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

Merge pull request #4001 from acemod/renameEvents

Browse Source 
Rename events
This commit is contained in:
Glowbal 2016-06-26 10:47:39 +02:00 committed by GitHub
commit b84b532cfb
22 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/cargo/XEH_postInit.sqf
View File

@ -1,6 +1,6 @@
#include "script_component.hpp" #include "script_component.hpp"
["ace_addCargoByClass", {_this call FUNC(addCargoItem)}] call CBA_fnc_addEventHandler; ["ace_addCargo", {_this call FUNC(addCargoItem)}] call CBA_fnc_addEventHandler;
["ace_loadCargo", { ["ace_loadCargo", {
params ["_item", "_vehicle"]; params ["_item", "_vehicle"];

4
addons/cargo/config.cpp
View File

@ -23,8 +23,8 @@ class ACE_newEvents {
LoadCargo = "ace_loadCargo"; LoadCargo = "ace_loadCargo";
cargoUnloaded = "ace_cargoUnloaded"; cargoUnloaded = "ace_cargoUnloaded";
cargoLoaded = "ace_cargoLoaded"; cargoLoaded = "ace_cargoLoaded";
AddCargoByClass = "ace_addCargoByClass"; AddCargoByClass = "ace_addCargo";
ServerUnloadCargo = QGVAR(serverUnload); ServerUnloadCargo = QGVAR(serverUnload);
UnloadCargo = "ace_unloadCargo"; UnloadCargo = "ace_unloadCargo";
cargoAddedByClass = "ace_cargoAddedByClass"; cargoAddedByClass = "ace_cargoAdded";
}; };

2
addons/cargo/functions/fnc_addCargoItem.sqf
View File

@ -26,4 +26,4 @@ for "_i" from 1 to _amount do {
}; };
// Invoke listenable event // Invoke listenable event
["ace_cargoAddedByClass", [_itemClass, _vehicle, _amount]] call CBA_fnc_globalEvent; ["ace_cargoAdded", [_itemClass, _vehicle, _amount]] call CBA_fnc_globalEvent;

2
addons/cargo/functions/fnc_initVehicle.sqf
View File

@ -29,7 +29,7 @@ if (isServer) then {
_cargoClassname = getText (_x >> "type"); _cargoClassname = getText (_x >> "type");
_cargoCount = getNumber (_x >> "amount"); _cargoCount = getNumber (_x >> "amount");
TRACE_3("adding ACE_Cargo", (configName _x), _cargoClassname, _cargoCount); TRACE_3("adding ACE_Cargo", (configName _x), _cargoClassname, _cargoCount);
["ace_addCargoByClass", [_cargoClassname, _vehicle, _cargoCount]] call CBA_fnc_localEvent; ["ace_addCargo", [_cargoClassname, _vehicle, _cargoCount]] call CBA_fnc_localEvent;
}; };
} count ("true" configClasses (configFile >> "CfgVehicles" >> _type >> "ACE_Cargo" >> "Cargo")); } count ("true" configClasses (configFile >> "CfgVehicles" >> _type >> "ACE_Cargo" >> "Cargo"));
}; };

16
addons/explosives/XEH_postInit.sqf
View File

@ -29,16 +29,16 @@ if (isServer) then {
[_unit] call FUNC(onIncapacitated); [_unit] call FUNC(onIncapacitated);
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
[QGVAR(clientRequestOrientations), { [QGVAR(sendOrientations), {
params ["_logic"]; params ["_logic"];
TRACE_1("clientRequestsOrientations received:",_logic); TRACE_1("sendOrientations received:",_logic);
// Filter the array before sending it // Filter the array before sending it
GVAR(explosivesOrientations) = GVAR(explosivesOrientations) select { GVAR(explosivesOrientations) = GVAR(explosivesOrientations) select {
_x params ["_explosive"]; _x params ["_explosive"];
(!isNull _explosive && {alive _explosive}) (!isNull _explosive && {alive _explosive})
}; };
TRACE_1("serverSendsOrientations sent:",GVAR(explosivesOrientations)); TRACE_1("orientationsSent sent:",GVAR(explosivesOrientations));
[QGVAR(serverSendOrientations), [GVAR(explosivesOrientations)], _logic] call CBA_fnc_targetEvent; [QGVAR(orientationsSent), [GVAR(explosivesOrientations)], _logic] call CBA_fnc_targetEvent;
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
}; };
@ -52,9 +52,9 @@ GVAR(CurrentSpeedDial) = 0;
// In case we are a JIP client, ask the server for orientation of any previously // In case we are a JIP client, ask the server for orientation of any previously
// placed mine. // placed mine.
if (didJIP) then { if (didJIP) then {
[QGVAR(serverSendOrientations), { [QGVAR(orientationsSent), {
params ["_explosivesOrientations"]; params ["_explosivesOrientations"];
TRACE_1("serverSendsOrientations received:",_explosivesOrientations); TRACE_1("orientationsSent received:",_explosivesOrientations);
{ {
_x params ["_explosive","_direction","_pitch"]; _x params ["_explosive","_direction","_pitch"];
TRACE_3("orientation set:",_explosive,_direction,_pitch); TRACE_3("orientation set:",_explosive,_direction,_pitch);
@ -66,8 +66,8 @@ if (didJIP) then {
// Create a logic to get the client ID // Create a logic to get the client ID
GVAR(localLogic) = ([sideLogic] call CBA_fnc_getSharedGroup) createUnit ["Logic", [0,0,0], [], 0, "NONE"]; GVAR(localLogic) = ([sideLogic] call CBA_fnc_getSharedGroup) createUnit ["Logic", [0,0,0], [], 0, "NONE"];
TRACE_1("clientRequestsOrientations sent:",GVAR(localLogic)); TRACE_1("sendOrientations sent:",GVAR(localLogic));
[QGVAR(clientRequestOrientations), [GVAR(localLogic)]] call CBA_fnc_serverEvent; [QGVAR(sendOrientations), [GVAR(localLogic)]] call CBA_fnc_serverEvent;
}; };
["ace_interactMenuOpened", { ["ace_interactMenuOpened", {

4
addons/explosives/config.cpp
View File

@ -46,6 +46,6 @@ class CfgMineTriggers {
}; };
class ACE_newEvents { class ACE_newEvents {
clientRequestsOrientations = QGVAR(clientRequestOrientations); clientRequestsOrientations = QGVAR(sendOrientations);
serverSendsOrientations = QGVAR(serverSendOrientations); serverSendsOrientations = QGVAR(orientationsSent);
}; };

4
addons/interaction/XEH_postInit.sqf
View File

@ -18,12 +18,12 @@ ACE_Modifier = 0;
_unit doMove _position; _unit doMove _position;
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
[QGVAR(lampTurnOn), { [QGVAR(setLampOn), {
params ["_lamp", "_hitPointsDamage", "_disabledLampDMG"]; params ["_lamp", "_hitPointsDamage", "_disabledLampDMG"];
{if((_x select 1) == _disabledLampDMG) then {_lamp setHit [_x select 0, 0];};nil} count _hitPointsDamage; {if((_x select 1) == _disabledLampDMG) then {_lamp setHit [_x select 0, 0];};nil} count _hitPointsDamage;
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
[QGVAR(lampTurnOff), { [QGVAR(setLampOff), {
params ["_lamp", "_hitPointsDamage", "_disabledLampDMG"]; params ["_lamp", "_hitPointsDamage", "_disabledLampDMG"];
{_lamp setHit [_x select 0, (_x select 1) max _disabledLampDMG];nil} count _hitPointsDamage; {_lamp setHit [_x select 0, (_x select 1) max _disabledLampDMG];nil} count _hitPointsDamage;
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;

4
addons/interaction/config.cpp
View File

@ -25,6 +25,6 @@ class ACE_newEvents {
pardon = QGVAR(pardon); pardon = QGVAR(pardon);
tapShoulder = QGVAR(tapShoulder); tapShoulder = QGVAR(tapShoulder);
sendAway = QGVAR(sendAway); sendAway = QGVAR(sendAway);
lampTurnOff = QGVAR(lampTurnOff); lampTurnOff = QGVAR(setLampOff);
lampTurnOn = QGVAR(lampTurnOn); lampTurnOn = QGVAR(setLampOn);
}; };

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

@ -29,7 +29,7 @@ private _hitPointsDamage = [];
} count _reflectors; } count _reflectors;
//if lamp is on turn it off //if lamp is on turn it off
private _eventName = [QGVAR(lampTurnOn), QGVAR(lampTurnOff)] select _isOn; private _eventName = [QGVAR(setLampOn), QGVAR(setLampOff)] select _isOn;
[_eventName, [_lamp, _hitPointsDamage, DISABLED_LAMP_DMG], [_lamp]] call CBA_fnc_targetEvent; [_eventName, [_lamp, _hitPointsDamage, DISABLED_LAMP_DMG], [_lamp]] call CBA_fnc_targetEvent;
_lamp setVariable ["ACE_lampOn", !_isOn, true]; _lamp setVariable ["ACE_lampOn", !_isOn, true];

8
addons/medical/config.cpp
View File

@ -29,12 +29,12 @@ class CfgPatches {
class ACE_newEvents { class ACE_newEvents {
medical_onUnconscious = "ace_unconscious"; medical_onUnconscious = "ace_unconscious";
medical_treatmentSuccess = "ace_treatmentSuccess"; medical_treatmentSuccess = "ace_treatmentSucceded";
medical_onSetDead = "ace_killed"; medical_onSetDead = "ace_killed";
Medical_onEnteredCardiacArrest = "ace_enteredCardiacArrest"; Medical_onEnteredCardiacArrest = "ace_cardiacArrestEntered";
Medical_onItemAddedToTriageCard = "ace_itemAddedToTriageCard"; Medical_onItemAddedToTriageCard = "ace_triageCardItemAdded";
medical_onLogEntryAdded = "ace_medicalLogEntryAdded"; medical_onLogEntryAdded = "ace_medicalLogEntryAdded";
Medical_onHeartRateAdjustmentAdded = "ace_addedHeartRateAdjustment"; Medical_onHeartRateAdjustmentAdded = "ace_heartRateAdjustmentAdded";
placedInBodyBag = "ace_placedInBodyBag"; placedInBodyBag = "ace_placedInBodyBag";
actionPlaceInBodyBag = QGVAR(actionPlaceInBodyBag); actionPlaceInBodyBag = QGVAR(actionPlaceInBodyBag);
treatmentTourniquetLocal = QGVAR(treatmentTourniquetLocal); treatmentTourniquetLocal = QGVAR(treatmentTourniquetLocal);

2
addons/medical/functions/fnc_addHeartRateAdjustment.sqf
View File

@ -22,4 +22,4 @@ private _adjustment = _unit getVariable [QGVAR(heartRateAdjustments), []];
_adjustment pushBack [_value, _time, _callBack]; _adjustment pushBack [_value, _time, _callBack];
_unit setVariable [QGVAR(heartRateAdjustments), _adjustment]; _unit setVariable [QGVAR(heartRateAdjustments), _adjustment];
["ace_addedHeartRateAdjustment", [_unit, _value, _time]] call CBA_fnc_localEvent; ["ace_heartRateAdjustmentAdded", [_unit, _value, _time]] call CBA_fnc_localEvent;

2
addons/medical/functions/fnc_addToTriageCard.sqf
View File

@ -39,4 +39,4 @@ if (!_inList) then {
_log pushBack [_newItem, 1, CBA_missionTime]; _log pushBack [_newItem, 1, CBA_missionTime];
}; };
_unit setVariable [QGVAR(triageCard), _log, true]; _unit setVariable [QGVAR(triageCard), _log, true];
["ace_itemAddedToTriageCard", [_unit, _newItem, _amount]] call CBA_fnc_localEvent; ["ace_triageCardItemAdded", [_unit, _newItem, _amount]] call CBA_fnc_localEvent;

2
addons/medical/functions/fnc_setCardiacArrest.sqf
View File

@ -21,7 +21,7 @@ if (_unit getVariable [QGVAR(inCardiacArrest),false]) exitWith {};
_unit setVariable [QGVAR(inCardiacArrest), true,true]; _unit setVariable [QGVAR(inCardiacArrest), true,true];
_unit setVariable [QGVAR(heartRate), 0]; _unit setVariable [QGVAR(heartRate), 0];
["ace_enteredCardiacArrest", [_unit]] call CBA_fnc_localEvent; ["ace_cardiacArrestEntered", [_unit]] call CBA_fnc_localEvent;
[_unit, true] call FUNC(setUnconscious); [_unit, true] call FUNC(setUnconscious);
_timeInCardiacArrest = 120 + round(random(600)); _timeInCardiacArrest = 120 + round(random(600));

2
addons/medical/functions/fnc_treatment_success.sqf
View File

@ -94,4 +94,4 @@ if (!(_target getVariable [QGVAR(addedToUnitLoop),false])) then {
[_target] call FUNC(addVitalLoop); [_target] call FUNC(addVitalLoop);
}; };
["ace_treatmentSuccess", [_caller, _target, _selectionName, _className]] call CBA_fnc_localEvent; ["ace_treatmentSucceded", [_caller, _target, _selectionName, _className]] call CBA_fnc_localEvent;

2
addons/medical_menu/XEH_postInit.sqf
View File

@ -6,7 +6,7 @@ GVAR(MenuPFHID) = -1;
GVAR(lastOpenedOn) = -1; GVAR(lastOpenedOn) = -1;
GVAR(pendingReopen) = false; GVAR(pendingReopen) = false;
["ace_treatmentSuccess", { ["ace_treatmentSucceded", {
if (GVAR(openAfterTreatment) && {GVAR(pendingReopen)}) then { if (GVAR(openAfterTreatment) && {GVAR(pendingReopen)}) then {
GVAR(pendingReopen) = false; GVAR(pendingReopen) = false;
[{ [{

4
addons/overheating/XEH_postInit.sqf
View File

@ -35,8 +35,8 @@ if (hasInterface) then {
GVAR(storedSpareBarrels) = [] call CBA_fnc_hashCreate; GVAR(storedSpareBarrels) = [] call CBA_fnc_hashCreate;
// Install event handlers for spare barrels // Install event handlers for spare barrels
[QGVAR(spareBarrelsSendTemperatureHint), FUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler; [QGVAR(sendSpareBarrelTemperatureHint), FUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler;
[QGVAR(spareBarrelsLoadCoolest), FUNC(loadCoolestSpareBarrel)] call CBA_fnc_addEventHandler; [QGVAR(loadCoolestSpareBarrel), FUNC(loadCoolestSpareBarrel)] call CBA_fnc_addEventHandler;
// Schedule cool down calculation of stored spare barrels // Schedule cool down calculation of stored spare barrels
[] call FUNC(updateSpareBarrelsTemperaturesThread); [] call FUNC(updateSpareBarrelsTemperaturesThread);

4
addons/overheating/config.cpp
View File

@ -55,7 +55,7 @@ class CfgGesturesMale {
class ACE_newEvents { class ACE_newEvents {
initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted); initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted);
showWeaponTemperature = QGVAR(showWeaponTemperature); showWeaponTemperature = QGVAR(showWeaponTemperature);
spareBarrelsLoadCoolest = QGVAR(spareBarrelsLoadCoolest); loadCoolestSpareBarrel = QGVAR(loadCoolestSpareBarrel);
spareBarrelsSendTemperatureHint = QGVAR(spareBarrelsSendTemperatureHint); sendSpareBarrelTemperatureHint = QGVAR(sendSpareBarrelTemperatureHint);
weaponJammed = "ace_weaponJammed"; weaponJammed = "ace_weaponJammed";
}; };

2
addons/overheating/functions/fnc_checkSpareBarrelsTemperatures.sqf
View File

@ -29,7 +29,7 @@ if (!([_player, objNull, ["isNotInside", "isNotSitting"]] call EFUNC(common,canI
params ["_args", "_elapsedTime", "_totalTime", "_errorCode"]; params ["_args", "_elapsedTime", "_totalTime", "_errorCode"];
_args params ["_player"]; _args params ["_player"];
// Time has enlapsed, ask the server to send the hint // Time has enlapsed, ask the server to send the hint
[QGVAR(spareBarrelsSendTemperatureHint), [_player, _player]] call CBA_fnc_serverEvent; [QGVAR(sendSpareBarrelTemperatureHint), [_player, _player]] call CBA_fnc_serverEvent;
}, },
{}, {},
(localize LSTRING(CheckingSpareBarrelsTemperatures)), (localize LSTRING(CheckingSpareBarrelsTemperatures)),

2
addons/overheating/functions/fnc_swapBarrelCallback.sqf
View File

@ -37,7 +37,7 @@ private _barrelMass = 0.50 * (getNumber (configFile >> "CfgWeapons" >> _weapon >
// store the removed barrel with the former weapon temperature. The server // store the removed barrel with the former weapon temperature. The server
// also updates the current weapon temperature to match that of the new // also updates the current weapon temperature to match that of the new
// loaded barrel. // loaded barrel.
[QGVAR(spareBarrelsLoadCoolest), [_assistant, _gunner, _weapon, _temp, _barrelMass]] call CBA_fnc_serverEvent; [QGVAR(loadCoolestSpareBarrel), [_assistant, _gunner, _weapon, _temp, _barrelMass]] call CBA_fnc_serverEvent;
// Store the update time // Store the update time
_gunner setVariable [format [QGVAR(%1_time), _weapon], CBA_missionTime]; _gunner setVariable [format [QGVAR(%1_time), _weapon], CBA_missionTime];

12
addons/reload/XEH_postInit.sqf
View File

@ -27,7 +27,7 @@ if (!hasInterface) exitWith {};
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
// Listen for attempts to link ammo // Listen for attempts to link ammo
[QGVAR(linkedAmmo), { [QGVAR(ammoLinked), {
params ["_receiver", "_giver", "_magazine"]; params ["_receiver", "_giver", "_magazine"];
private _magazineType = currentMagazine _receiver; private _magazineType = currentMagazine _receiver;
@ -35,7 +35,7 @@ if (!hasInterface) exitWith {};
// Return the magazine if it's the wrong type // Return the magazine if it's the wrong type
if (_magazineType != (_magazine select 0)) exitWith { if (_magazineType != (_magazine select 0)) exitWith {
[QGVAR(returnedAmmo), [_giver,_receiver,_magazine], [_giver]] call CBA_fnc_targetEvent; [QGVAR(ammoReturned), [_giver,_receiver,_magazine], [_giver]] call CBA_fnc_targetEvent;
}; };
private _ammoCount = _receiver ammo currentWeapon _receiver; private _ammoCount = _receiver ammo currentWeapon _receiver;
@ -43,7 +43,7 @@ if (!hasInterface) exitWith {};
// Return the magazine if the belt is full or empty // Return the magazine if the belt is full or empty
if ((_ammoCount == 0) || _ammoMissing == 0) exitWith { if ((_ammoCount == 0) || _ammoMissing == 0) exitWith {
[QGVAR(returnedAmmo), [_giver,_receiver,_magazine], [_giver]] call CBA_fnc_targetEvent; [QGVAR(ammoReturned), [_giver,_receiver,_magazine], [_giver]] call CBA_fnc_targetEvent;
}; };
// Add the ammo // Add the ammo
@ -51,14 +51,14 @@ if (!hasInterface) exitWith {};
[QGVAR(syncAmmo), [_receiver, currentWeapon _receiver, _ammoCount + _ammoAdded]] call CBA_fnc_globalEvent; [QGVAR(syncAmmo), [_receiver, currentWeapon _receiver, _ammoCount + _ammoAdded]] call CBA_fnc_globalEvent;
if ((_magazine select 1) - _ammoAdded > 0) then { if ((_magazine select 1) - _ammoAdded > 0) then {
[QGVAR(returnedAmmo), [_giver, _receiver, [_magazineType, (_magazine select 1) - _ammoAdded]], [_giver]] call CBA_fnc_targetEvent; [QGVAR(ammoReturned), [_giver, _receiver, [_magazineType, (_magazine select 1) - _ammoAdded]], [_giver]] call CBA_fnc_targetEvent;
}; };
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
// Listen for returned magazines // Listen for returned magazines
[QGVAR(returnedAmmo), { [QGVAR(ammoReturned), {
params ["_receiver", "", "_magazine"]; params ["_receiver", "", "_magazine"];
TRACE_2("returnedAmmo EH",_receiver,_magazine); TRACE_2("ammoReturned EH",_receiver,_magazine);
_receiver addMagazine _magazine; _receiver addMagazine _magazine;
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;

4
addons/reload/config.cpp
View File

@ -23,6 +23,6 @@ class CfgPatches {
class ACE_newEvents { class ACE_newEvents {
setAmmoSync = QGVAR(syncAmmo); setAmmoSync = QGVAR(syncAmmo);
returnedAmmo = QGVAR(returnedAmmo); returnedAmmo = QGVAR(ammoReturned);
linkedAmmo = QGVAR(linkedAmmo); linkedAmmo = QGVAR(ammoLinked);
}; };

2
addons/reload/functions/fnc_startLinkingBelt.sqf
View File

@ -46,7 +46,7 @@ private _onFinish = {
(_this select 0) params ["_player", "_target", "_magazine"]; (_this select 0) params ["_player", "_target", "_magazine"];
// Raise event on remote unit // Raise event on remote unit
[QGVAR(linkedAmmo), [_target, _player, _magazine], [_target]] call CBA_fnc_targetEvent; [QGVAR(ammoLinked), [_target, _player, _magazine], [_target]] call CBA_fnc_targetEvent;
}; };
private _onFailure = { private _onFailure = {