diff --git a/addons/hearing/$PBOPREFIX$ b/addons/hearing/$PBOPREFIX$ new file mode 100644 index 0000000000..215e681d94 --- /dev/null +++ b/addons/hearing/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\hearing \ No newline at end of file diff --git a/addons/hearing/CfgEventHandlers.hpp b/addons/hearing/CfgEventHandlers.hpp index 1198729b4d..461d6233df 100644 --- a/addons/hearing/CfgEventHandlers.hpp +++ b/addons/hearing/CfgEventHandlers.hpp @@ -30,7 +30,7 @@ class Extended_FiredNear_EventHandlers { class Extended_Explosion_EventHandlers { class CAManBase { class GVAR(ExplosionNear) { - clientExplosion = QUOTE( if (_this select 0 == #CE_player) then {_this call FUNC(explosionNear)}; ); + clientExplosion = QUOTE( if (_this select 0 == ACE_player) then {_this call FUNC(explosionNear)}; ); }; }; }; \ No newline at end of file diff --git a/addons/hearing/CfgSounds.hpp b/addons/hearing/CfgSounds.hpp index ce442838d0..17436088c3 100644 --- a/addons/hearing/CfgSounds.hpp +++ b/addons/hearing/CfgSounds.hpp @@ -1,14 +1,14 @@ class CfgSounds { class ACE_EarRinging_Weak { - sound[] = {QUOTE(PATHOF(sounds\ACE_earringing_weak.wav),8,1.7}; + sound[] = {QUOTE(PATHTOF(sounds\ACE_earringing_weak.wav)),8,1.7}; titles[] = {}; }; class ACE_EarRinging_Medium { - sound[] = {QUOTE(PATHOF(sounds\ACE_earringing_medium.wav),8,1.7}; + sound[] = {QUOTE(PATHTOF(sounds\ACE_earringing_medium.wav)),8,1.7}; titles[] = {}; }; class ACE_EarRinging_Heavy { - sound[] = {QUOTE(PATHOF(sounds\ACE_earringing_heavy.wav),8,1.7}; + sound[] = {QUOTE(PATHTOF(sounds\ACE_earringing_heavy.wav)),8,1.7}; titles[] = {}; }; }; \ No newline at end of file diff --git a/addons/hearing/CfgVehicles.hpp b/addons/hearing/CfgVehicles.hpp index 153357115e..42da667b81 100644 --- a/addons/hearing/CfgVehicles.hpp +++ b/addons/hearing/CfgVehicles.hpp @@ -15,7 +15,7 @@ class CfgVehicles { statement = QUOTE( [_player] call FUNC(putInEarPlugs) ); showDisabled = 0; priority = 2.5; - icon = QUOTE(PATHOF(UI\ACE_earplugs_x_ca.paa)); + icon = QUOTE(PATHTOF(UI\ACE_earplugs_x_ca.paa)); hotkey = "E"; enableInside = 1; }; @@ -25,7 +25,7 @@ class CfgVehicles { statement = QUOTE( [_player] call FUNC(removeEarPlugs) ); showDisabled = 0; priority = 2.5; - icon = QUOTE(PATHOF(UI\ACE_earplugs_x_ca.paa)); + icon = QUOTE(PATHTOF(UI\ACE_earplugs_x_ca.paa)); hotkey = "E"; enableInside = 1; }; diff --git a/addons/hearing/CfgWeapons.hpp b/addons/hearing/CfgWeapons.hpp index d4614b6370..db5617c35b 100644 --- a/addons/hearing/CfgWeapons.hpp +++ b/addons/hearing/CfgWeapons.hpp @@ -5,8 +5,8 @@ class CfgWeapons { class ACE_EarBuds: ACE_ItemCore { displayName = "$STR_ACE_Hearing_Earbuds_Name"; descriptionShort = "$STR_ACE_Hearing_Earbuds_Description"; - model = QUOTE(PATHOF(ACE_earplugs.p3d); - picture = QUOTE(PATHOF(UI\ACE_earplugs_x_ca.paa); + model = QUOTE(PATHTOF(ACE_earplugs.p3d)); + picture = QUOTE(PATHTOF(UI\ACE_earplugs_x_ca.paa)); scope = 2; class ItemInfo: InventoryItem_Base_F { mass = 1; diff --git a/addons/hearing/config.cpp b/addons/hearing/config.cpp index 5cb9890b51..6504710eae 100644 --- a/addons/hearing/config.cpp +++ b/addons/hearing/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { units[] = {}; weapons[] = {"ACE_EarBuds"}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_common"}; + requiredAddons[] = {"ace_common", "ace_interaction"}; author[] = {"KoffeinFlummi", "CAA-Picard", "HopeJ", "commy2"}; authorUrl = "https://github.com/KoffeinFlummi/"; VERSION_CONFIG; diff --git a/addons/hearing/functions/fnc_addEarPlugs.sqf b/addons/hearing/functions/fnc_addEarPlugs.sqf index 58436b6223..9253717c11 100644 --- a/addons/hearing/functions/fnc_addEarPlugs.sqf +++ b/addons/hearing/functions/fnc_addEarPlugs.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\hearing\script_component.hpp" +#include "script_component.hpp" private ["_unit", "_launcher"]; diff --git a/addons/hearing/functions/fnc_earRinging.sqf b/addons/hearing/functions/fnc_earRinging.sqf index bb19679886..a23fafae99 100644 --- a/addons/hearing/functions/fnc_earRinging.sqf +++ b/addons/hearing/functions/fnc_earRinging.sqf @@ -9,7 +9,7 @@ * Return Value: * none */ -#include "\z\ace\addons\hearing\script_component.hpp" +#include "script_component.hpp" private ["_unit", "_strength"]; diff --git a/addons/hearing/functions/fnc_explosionNear.sqf b/addons/hearing/functions/fnc_explosionNear.sqf index 0808e959fa..8c7b477da0 100644 --- a/addons/hearing/functions/fnc_explosionNear.sqf +++ b/addons/hearing/functions/fnc_explosionNear.sqf @@ -9,7 +9,7 @@ * Return Value: * none */ -#include "\z\ace\addons\hearing\script_component.hpp" +#include "script_component.hpp" private ["_unit", "_damage", "_strength"]; diff --git a/addons/hearing/functions/fnc_firedNear.sqf b/addons/hearing/functions/fnc_firedNear.sqf index e5ed0465df..10e8508617 100644 --- a/addons/hearing/functions/fnc_firedNear.sqf +++ b/addons/hearing/functions/fnc_firedNear.sqf @@ -9,7 +9,7 @@ * Return Value: * none */ -#include "\z\ace\addons\hearing\script_component.hpp" +#include "script_component.hpp" private ["_unit", "_firer", "_distance", "_weapon", "_muzzle", "_mode", "_ammo", "_silencer", "_audibleFireCoef", "_loudness", "_strength"]; diff --git a/addons/hearing/functions/fnc_hasEarPlugsIn.sqf b/addons/hearing/functions/fnc_hasEarPlugsIn.sqf index 7dccd83865..8fcfe1eeb1 100644 --- a/addons/hearing/functions/fnc_hasEarPlugsIn.sqf +++ b/addons/hearing/functions/fnc_hasEarPlugsIn.sqf @@ -9,7 +9,7 @@ * Return value: * Boolean (Bool) */ -#include "\z\ace\addons\hearing\script_component.hpp" +#include "script_component.hpp" private "_unit"; diff --git a/addons/hearing/functions/fnc_putInEarplugs.sqf b/addons/hearing/functions/fnc_putInEarplugs.sqf index 7de9ae1ce9..767ec9c698 100644 --- a/addons/hearing/functions/fnc_putInEarplugs.sqf +++ b/addons/hearing/functions/fnc_putInEarplugs.sqf @@ -10,7 +10,7 @@ * Return Value: * none */ -#include "\z\ace\addons\hearing\script_component.hpp" +#include "script_component.hpp" private "_player"; diff --git a/addons/hearing/functions/fnc_removeEarplugs.sqf b/addons/hearing/functions/fnc_removeEarplugs.sqf index 1c125fd12f..9436807a46 100644 --- a/addons/hearing/functions/fnc_removeEarplugs.sqf +++ b/addons/hearing/functions/fnc_removeEarplugs.sqf @@ -10,7 +10,7 @@ * Return Value: * none */ -#include "\z\ace\addons\hearing\script_component.hpp" +#include "script_component.hpp" private "_player"; diff --git a/addons/hearing/functions/script_component.hpp b/addons/hearing/functions/script_component.hpp new file mode 100644 index 0000000000..18305605c4 --- /dev/null +++ b/addons/hearing/functions/script_component.hpp @@ -0,0 +1 @@ +#include "\z\ace\addons\hearing\script_component.hpp" \ No newline at end of file diff --git a/addons/hearing/script_component.hpp b/addons/hearing/script_component.hpp new file mode 100644 index 0000000000..15023f2509 --- /dev/null +++ b/addons/hearing/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT hearing +#include "\z\ace\Addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_HEARING + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_HEARING + #define DEBUG_SETTINGS DEBUG_SETTINGS_HEARING +#endif + +#include "\z\ace\Addons\main\script_macros.hpp"