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 overheating and reloadlaunchers

Browse Source
This commit is contained in:
jonpas 2016-05-25 20:13:36 +02:00
parent 87ee34ba35
commit 5d36f84eb1
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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
["ace_spareBarrelsSendTemperatureHint", FUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler; [QGVAR(spareBarrelsSendTemperatureHint), FUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler;
["ace_spareBarrelsLoadCoolest", FUNC(loadCoolestSpareBarrel)] call CBA_fnc_addEventHandler; [QGVAR(spareBarrelsLoadCoolest), 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);
@ -62,8 +62,8 @@ if (hasInterface) then {
[] call FUNC(updateTemperatureThread); [] call FUNC(updateTemperatureThread);
// Install event handler to display temp when a barrel was swapped // Install event handler to display temp when a barrel was swapped
["ace_showWeaponTemperature", DFUNC(displayTemperature)] call CBA_fnc_addEventHandler; [QGVAR(showWeaponTemperature), DFUNC(displayTemperature)] call CBA_fnc_addEventHandler;
// Install event handler to initiate an assisted barrel swap // Install event handler to initiate an assisted barrel swap
["ace_initiateSwapBarrelAssisted", DFUNC(swapBarrel)] call CBA_fnc_addEventHandler; [QGVAR(initiateSwapBarrelAssisted), DFUNC(swapBarrel)] call CBA_fnc_addEventHandler;
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;

8
addons/overheating/config.cpp
View File

@ -52,12 +52,12 @@ class CfgGesturesMale {
}; };
class ACE_newEvents { class ACE_newEvents {
SettingsInitialized = "ace_settingsInitialized"; SettingsInitialized = "ace_settingsInitialized";
initiateSwapBarrelAssisted = "ace_initiateSwapBarrelAssisted"; initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted);
showWeaponTemperature = "ace_showWeaponTemperature"; showWeaponTemperature = QGVAR(showWeaponTemperature);
firedPlayerNonLocal = "ace_firedPlayerNonLocal"; firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer"; firedPlayer = "ace_firedPlayer";
spareBarrelsLoadCoolest = "ace_spareBarrelsLoadCoolest"; spareBarrelsLoadCoolest = QGVAR(spareBarrelsLoadCoolest);
spareBarrelsSendTemperatureHint = "ace_spareBarrelsSendTemperatureHint"; spareBarrelsSendTemperatureHint = QGVAR(spareBarrelsSendTemperatureHint);
displayTextStructured = "ace_displayTextStructured"; displayTextStructured = "ace_displayTextStructured";
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
['spareBarrelsSendTemperatureHint', [_player, _player]] call CBA_fnc_serverEvent; [QGVAR(spareBarrelsSendTemperatureHint), [_player, _player]] call CBA_fnc_serverEvent;
}, },
{}, {},
(localize LSTRING(CheckingSpareBarrelsTemperatures)), (localize LSTRING(CheckingSpareBarrelsTemperatures)),

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

@ -50,4 +50,4 @@ _gunner setVariable [format [QGVAR(%1_temp), _weapon], _coolestTemp, true];
[GVAR(storedSpareBarrels), _coolestMag, [_weaponTemp, ACE_Time, _barrelMass]] call CBA_fnc_hashSet; [GVAR(storedSpareBarrels), _coolestMag, [_weaponTemp, ACE_Time, _barrelMass]] call CBA_fnc_hashSet;
// Send an event so the machines of the assistant and gunner can show the hint // Send an event so the machines of the assistant and gunner can show the hint
["ace_showWeaponTemperature", _gunner], [_gunner, _weapon], [_assistant] call CBA_fnc_targetEvent; [QGVAR(showWeaponTemperature), _gunner], [_gunner, _weapon], [_assistant] call CBA_fnc_targetEvent;

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

@ -30,4 +30,4 @@ playSound "ACE_BarrelSwap";
[3, [_assistant, _gunner, _weapon], {}, {}, (localize LSTRING(SwappingBarrel))] call EFUNC(common,progressBar); [3, [_assistant, _gunner, _weapon], {}, {}, (localize LSTRING(SwappingBarrel))] call EFUNC(common,progressBar);
["ace_initiateSwapBarrelAssisted", [_assistant, _gunner, _weapon], _gunner] call CBA_fnc_targetEvent; [QGVAR(initiateSwapBarrelAssisted), [_assistant, _gunner, _weapon], _gunner] call CBA_fnc_targetEvent;

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

@ -34,7 +34,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.
["ace_spareBarrelsLoadCoolest", [_assistant, _gunner, _weapon, _temp, _barrelMass]] call CBA_fnc_serverEvent; [QGVAR(spareBarrelsLoadCoolest), [_assistant, _gunner, _weapon, _temp, _barrelMass]] call CBA_fnc_serverEvent;
// Store the update time // Store the update time
_gunner setVariable [format [QGVAR(%1_time), _weapon], ACE_time]; _gunner setVariable [format [QGVAR(%1_time), _weapon], ACE_time];

2
addons/reloadlaunchers/XEH_postInit.sqf
View File

@ -1,4 +1,4 @@
// by commy2 // by commy2
#include "script_component.hpp" #include "script_component.hpp"
["ace_reloadLauncher", {_this call DFUNC(reloadLauncher)}] call CBA_fnc_addEventHandler; [QGVAR(reloadLauncher), {_this call DFUNC(reloadLauncher)}] call CBA_fnc_addEventHandler;

2
addons/reloadlaunchers/config.cpp
View File

@ -18,5 +18,5 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
class ACE_newEvents { class ACE_newEvents {
reloadLauncher = "ace_reloadLauncher"; reloadLauncher = QGVAR(reloadLauncher);
}; };

2
addons/reloadlaunchers/functions/fnc_load.sqf
View File

@ -32,7 +32,7 @@ private ["_onSuccess", "_onFailure", "_condition"];
_onSuccess = { _onSuccess = {
(_this select 0 select 0) removeMagazine (_this select 0 select 3); (_this select 0 select 0) removeMagazine (_this select 0 select 3);
["ace_reloadLauncher", _this select 0, _this select 0 select 1] call CBA_fnc_targetEvent; [QGVAR(reloadLauncher), _this select 0, _this select 0 select 1] call CBA_fnc_targetEvent;
[localize LSTRING(LauncherLoaded)] call DEFUNC(common,displayTextStructured); [localize LSTRING(LauncherLoaded)] call DEFUNC(common,displayTextStructured);
}; };