From a97b767283742b18959a708e20bac697afc8d0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Tue, 13 Jan 2015 21:07:32 -0300 Subject: [PATCH] overheating: ironing out bugs --- addons/overheating/CfgEventHandlers.hpp | 4 ++-- addons/overheating/CfgSounds.hpp | 2 +- addons/overheating/CfgVehicles.hpp | 8 ++++---- addons/overheating/CfgWeapons.hpp | 2 +- addons/overheating/config.cpp | 8 ++++---- addons/overheating/functions/fnc_checkTemperature.sqf | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/overheating/CfgEventHandlers.hpp b/addons/overheating/CfgEventHandlers.hpp index 839856a5db..f5c0105711 100644 --- a/addons/overheating/CfgEventHandlers.hpp +++ b/addons/overheating/CfgEventHandlers.hpp @@ -1,6 +1,6 @@ class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE( call COMPILE_FILE(XEH_preInit.sqf) ); + init = QUOTE( call COMPILE_FILE(XEH_preInit) ); }; }; @@ -15,7 +15,7 @@ class Extended_FiredBIS_EventHandlers { class Extended_Take_EventHandlers { class CAManBase { class GVAR(UnjamReload) { - clientTake = QUOTE( if (_this select 0 == ACE_player && {(_this select 1) in [ARR_3(uniformContainer (_this select 0), vestContainer (_this select 0), backpackContainer (_this select 0))]} && {_this select 2 == currentMagazine (_this select 0)}) then {_vehicle = vehicle (_this select 0); [ARR_4(_vehicle, currentWeapon _vehicle, true)] call FUNC(clearJam)}; ); + clientTake = QUOTE( if (_this select 0 == ACE_player && {(_this select 1) in [ARR_3(uniformContainer (_this select 0), vestContainer (_this select 0), backpackContainer (_this select 0))]} && {_this select 2 == currentMagazine (_this select 0)}) then {_vehicle = vehicle (_this select 0); [ARR_3(_vehicle, currentWeapon _vehicle, true)] call FUNC(clearJam)}; ); }; }; }; diff --git a/addons/overheating/CfgSounds.hpp b/addons/overheating/CfgSounds.hpp index a3d593ec7a..fd3a5596bd 100644 --- a/addons/overheating/CfgSounds.hpp +++ b/addons/overheating/CfgSounds.hpp @@ -1,6 +1,6 @@ class CfgSounds { class ACE_BarrelSwap { - sound[] = {QUOTE(PATHOF(sounds\barrelswap.ogg)),5,1,200}; + sound[] = {QUOTE(PATHTOF(sounds\barrelswap.ogg)),5,1,200}; titles[] = {}; }; }; diff --git a/addons/overheating/CfgVehicles.hpp b/addons/overheating/CfgVehicles.hpp index a3c955dd12..6ab439f94f 100644 --- a/addons/overheating/CfgVehicles.hpp +++ b/addons/overheating/CfgVehicles.hpp @@ -15,17 +15,17 @@ class CfgVehicles { statement = QUOTE( [_player, currentWeapon _player] call FUNC(swapBarrel); ); showDisabled = 0; priority = 3; - icon = QUOTE(PATHOF(UI\spare_barrel_ca.paa)); + icon = QUOTE(PATHTOF(UI\spare_barrel_ca.paa)); hotkey = "B"; }; }; class ACE_CheckTemperature { displayName = "$STR_ACE_Overheating_CheckTemperatureShort"; - condition = QUOTE( currentWeapon _player in [primaryWeapon _player, secondaryWeapon _player, handgunWeapon _player] ); - statement = QUOTE( [_player, currentWeapon _player] call FUNC(CheckTemperature); ); + condition = QUOTE( currentWeapon _player in [ARR_3(primaryWeapon _player, secondaryWeapon _player, handgunWeapon _player)] ); + statement = QUOTE( [ARR_2(_player, currentWeapon _player)] call FUNC(CheckTemperature); ); showDisabled = 0; priority = 3.1; - icon = QUOTE(PATHOF(UI\temp_ca.paa)); + icon = QUOTE(PATHTOF(UI\temp_ca.paa)); hotkey = "P"; }; }; diff --git a/addons/overheating/CfgWeapons.hpp b/addons/overheating/CfgWeapons.hpp index fc379494f0..fff251f096 100644 --- a/addons/overheating/CfgWeapons.hpp +++ b/addons/overheating/CfgWeapons.hpp @@ -6,7 +6,7 @@ class CfgWeapons { displayname = "$STR_ACE_Overheating_SpareBarrelName"; descriptionshort = "$STR_ACE_Overheating_SpareBarrelDescription"; //model = ""; - picture = QUOTE(PATHOF(UI\spare_barrel_ca.paa)); + picture = QUOTE(PATHTOF(UI\spare_barrel_ca.paa)); scope = 2; class ItemInfo: InventoryItem_Base_F { mass = 50; diff --git a/addons/overheating/config.cpp b/addons/overheating/config.cpp index 3fa17d9be0..1cb2793c52 100644 --- a/addons/overheating/config.cpp +++ b/addons/overheating/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { units[] = {}; weapons[] = {"ACE_SpareBarrel"}; requiredVersion = 0.60; - requiredAddons[] = {ACE_Core, ACE_Interaction}; + requiredAddons[] = {ace_common, ace_interaction}; version = "0.95"; versionStr = "0.95"; versionAr[] = {0,95,0}; @@ -16,11 +16,11 @@ class CfgPatches { #include "CfgEventHandlers.hpp" -class ACE_Core_Default_Keys { +class ACE_Default_Keys { class clearJam { displayName = "$STR_ACE_Overheating_UnjamWeapon"; - condition = QUOTE( [_player] call EFUNC(common,canUseWeapon) && {currentWeapon _player in (_player getVariable [QUOTE(QGVAR(jammedWeapons)), []])} ); - statement = QUOTE( [_player, currentMuzzle _player, false] call FUNC(clearJam); ); + condition = QUOTE( [_player] call EFUNC(common,canUseWeapon) && {currentWeapon _player in (_player getVariable [ARR_2(QUOTE(QGVAR(jammedWeapons)), [])])} ); + statement = QUOTE( [ARR_3(_player, currentMuzzle _player, false)] call FUNC(clearJam); ); key = 19; shift = 1; control = 0; diff --git a/addons/overheating/functions/fnc_checkTemperature.sqf b/addons/overheating/functions/fnc_checkTemperature.sqf index a19221eaa4..de2c45b1ff 100644 --- a/addons/overheating/functions/fnc_checkTemperature.sqf +++ b/addons/overheating/functions/fnc_checkTemperature.sqf @@ -6,7 +6,7 @@ _this spawn { _weapon = _this select 1; // Calculate cool down of weapon since last shot - _string = format [GVAR(%1), _weapon]; + _string = format [QGVAR(%1), _weapon]; _overheat = _player getVariable [_string, [0, 0]]; _temperature = _overheat select 0; _time = _overheat select 1;