From 5d36f84eb1d2ad1586621334c9990fc0d4cec898 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Wed, 25 May 2016 20:13:36 +0200
Subject: [PATCH] qGVAR overheating and reloadlaunchers
---
addons/overheating/XEH_postInit.sqf | 8 ++++----
addons/overheating/config.cpp | 8 ++++----
.../functions/fnc_checkSpareBarrelsTemperatures.sqf | 2 +-
.../overheating/functions/fnc_loadCoolestSpareBarrel.sqf | 2 +-
addons/overheating/functions/fnc_swapBarrelAssistant.sqf | 2 +-
addons/overheating/functions/fnc_swapBarrelCallback.sqf | 2 +-
addons/reloadlaunchers/XEH_postInit.sqf | 2 +-
addons/reloadlaunchers/config.cpp | 2 +-
addons/reloadlaunchers/functions/fnc_load.sqf | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf
index c42ce1f9fd..f5a162e075 100644
--- a/addons/overheating/XEH_postInit.sqf
+++ b/addons/overheating/XEH_postInit.sqf
@@ -35,8 +35,8 @@ if (hasInterface) then {
GVAR(storedSpareBarrels) = [] call CBA_fnc_hashCreate;
// Install event handlers for spare barrels
- ["ace_spareBarrelsSendTemperatureHint", FUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler;
- ["ace_spareBarrelsLoadCoolest", FUNC(loadCoolestSpareBarrel)] call CBA_fnc_addEventHandler;
+ [QGVAR(spareBarrelsSendTemperatureHint), FUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler;
+ [QGVAR(spareBarrelsLoadCoolest), FUNC(loadCoolestSpareBarrel)] call CBA_fnc_addEventHandler;
// Schedule cool down calculation of stored spare barrels
[] call FUNC(updateSpareBarrelsTemperaturesThread);
@@ -62,8 +62,8 @@ if (hasInterface) then {
[] call FUNC(updateTemperatureThread);
// 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
- ["ace_initiateSwapBarrelAssisted", DFUNC(swapBarrel)] call CBA_fnc_addEventHandler;
+ [QGVAR(initiateSwapBarrelAssisted), DFUNC(swapBarrel)] call CBA_fnc_addEventHandler;
}] call CBA_fnc_addEventHandler;
diff --git a/addons/overheating/config.cpp b/addons/overheating/config.cpp
index 89158a67e1..c945716149 100644
--- a/addons/overheating/config.cpp
+++ b/addons/overheating/config.cpp
@@ -52,12 +52,12 @@ class CfgGesturesMale {
};
class ACE_newEvents {
SettingsInitialized = "ace_settingsInitialized";
- initiateSwapBarrelAssisted = "ace_initiateSwapBarrelAssisted";
- showWeaponTemperature = "ace_showWeaponTemperature";
+ initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted);
+ showWeaponTemperature = QGVAR(showWeaponTemperature);
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
firedPlayer = "ace_firedPlayer";
- spareBarrelsLoadCoolest = "ace_spareBarrelsLoadCoolest";
- spareBarrelsSendTemperatureHint = "ace_spareBarrelsSendTemperatureHint";
+ spareBarrelsLoadCoolest = QGVAR(spareBarrelsLoadCoolest);
+ spareBarrelsSendTemperatureHint = QGVAR(spareBarrelsSendTemperatureHint);
displayTextStructured = "ace_displayTextStructured";
weaponJammed = "ace_weaponJammed";
};
diff --git a/addons/overheating/functions/fnc_checkSpareBarrelsTemperatures.sqf b/addons/overheating/functions/fnc_checkSpareBarrelsTemperatures.sqf
index 129f80845b..be2e1ae1a5 100644
--- a/addons/overheating/functions/fnc_checkSpareBarrelsTemperatures.sqf
+++ b/addons/overheating/functions/fnc_checkSpareBarrelsTemperatures.sqf
@@ -29,7 +29,7 @@ if (!([_player, objNull, ["isNotInside", "isNotSitting"]] call EFUNC(common,canI
params ["_args", "_elapsedTime", "_totalTime", "_errorCode"];
_args params ["_player"];
// 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)),
diff --git a/addons/overheating/functions/fnc_loadCoolestSpareBarrel.sqf b/addons/overheating/functions/fnc_loadCoolestSpareBarrel.sqf
index c77a5dbed2..f4636150b5 100644
--- a/addons/overheating/functions/fnc_loadCoolestSpareBarrel.sqf
+++ b/addons/overheating/functions/fnc_loadCoolestSpareBarrel.sqf
@@ -50,4 +50,4 @@ _gunner setVariable [format [QGVAR(%1_temp), _weapon], _coolestTemp, true];
[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
-["ace_showWeaponTemperature", _gunner], [_gunner, _weapon], [_assistant] call CBA_fnc_targetEvent;
+[QGVAR(showWeaponTemperature), _gunner], [_gunner, _weapon], [_assistant] call CBA_fnc_targetEvent;
diff --git a/addons/overheating/functions/fnc_swapBarrelAssistant.sqf b/addons/overheating/functions/fnc_swapBarrelAssistant.sqf
index 326afcae1c..dd6d51d109 100644
--- a/addons/overheating/functions/fnc_swapBarrelAssistant.sqf
+++ b/addons/overheating/functions/fnc_swapBarrelAssistant.sqf
@@ -30,4 +30,4 @@ playSound "ACE_BarrelSwap";
[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;
diff --git a/addons/overheating/functions/fnc_swapBarrelCallback.sqf b/addons/overheating/functions/fnc_swapBarrelCallback.sqf
index 73cf5f6006..17864ab3f6 100644
--- a/addons/overheating/functions/fnc_swapBarrelCallback.sqf
+++ b/addons/overheating/functions/fnc_swapBarrelCallback.sqf
@@ -34,7 +34,7 @@ private _barrelMass = 0.50 * (getNumber (configFile >> "CfgWeapons" >> _weapon >
// store the removed barrel with the former weapon temperature. The server
// also updates the current weapon temperature to match that of the new
// 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
_gunner setVariable [format [QGVAR(%1_time), _weapon], ACE_time];
diff --git a/addons/reloadlaunchers/XEH_postInit.sqf b/addons/reloadlaunchers/XEH_postInit.sqf
index 0800c4b0eb..8c18d430c4 100644
--- a/addons/reloadlaunchers/XEH_postInit.sqf
+++ b/addons/reloadlaunchers/XEH_postInit.sqf
@@ -1,4 +1,4 @@
// by commy2
#include "script_component.hpp"
-["ace_reloadLauncher", {_this call DFUNC(reloadLauncher)}] call CBA_fnc_addEventHandler;
+[QGVAR(reloadLauncher), {_this call DFUNC(reloadLauncher)}] call CBA_fnc_addEventHandler;
diff --git a/addons/reloadlaunchers/config.cpp b/addons/reloadlaunchers/config.cpp
index 915316ac39..044b05086b 100644
--- a/addons/reloadlaunchers/config.cpp
+++ b/addons/reloadlaunchers/config.cpp
@@ -18,5 +18,5 @@ class CfgPatches {
#include "CfgWeapons.hpp"
class ACE_newEvents {
- reloadLauncher = "ace_reloadLauncher";
+ reloadLauncher = QGVAR(reloadLauncher);
};
diff --git a/addons/reloadlaunchers/functions/fnc_load.sqf b/addons/reloadlaunchers/functions/fnc_load.sqf
index 59d28f8cad..863d1e9189 100644
--- a/addons/reloadlaunchers/functions/fnc_load.sqf
+++ b/addons/reloadlaunchers/functions/fnc_load.sqf
@@ -32,7 +32,7 @@ private ["_onSuccess", "_onFailure", "_condition"];
_onSuccess = {
(_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);
};