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

hearing: various fixes

Browse Source
This commit is contained in:
Nicolás Badano 2015-01-13 22:41:53 -03:00
parent 5af4f1ed53
commit e7c3b0db18
15 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/hearing/$PBOPREFIX$ Normal file
View File

@ -0,0 +1 @@
z\ace\addons\hearing

2
addons/hearing/CfgEventHandlers.hpp
View File

@ -30,7 +30,7 @@ class Extended_FiredNear_EventHandlers {
class Extended_Explosion_EventHandlers { class Extended_Explosion_EventHandlers {
class CAManBase { class CAManBase {
class GVAR(ExplosionNear) { 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)}; );
}; };
}; };
}; };

6
addons/hearing/CfgSounds.hpp
View File

@ -1,14 +1,14 @@
class CfgSounds { class CfgSounds {
class ACE_EarRinging_Weak { 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[] = {}; titles[] = {};
}; };
class ACE_EarRinging_Medium { 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[] = {}; titles[] = {};
}; };
class ACE_EarRinging_Heavy { 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[] = {}; titles[] = {};
}; };
}; };

4
addons/hearing/CfgVehicles.hpp
View File

@ -15,7 +15,7 @@ class CfgVehicles {
statement = QUOTE( [_player] call FUNC(putInEarPlugs) ); statement = QUOTE( [_player] call FUNC(putInEarPlugs) );
showDisabled = 0; showDisabled = 0;
priority = 2.5; priority = 2.5;
icon = QUOTE(PATHOF(UI\ACE_earplugs_x_ca.paa)); icon = QUOTE(PATHTOF(UI\ACE_earplugs_x_ca.paa));
hotkey = "E"; hotkey = "E";
enableInside = 1; enableInside = 1;
}; };
@ -25,7 +25,7 @@ class CfgVehicles {
statement = QUOTE( [_player] call FUNC(removeEarPlugs) ); statement = QUOTE( [_player] call FUNC(removeEarPlugs) );
showDisabled = 0; showDisabled = 0;
priority = 2.5; priority = 2.5;
icon = QUOTE(PATHOF(UI\ACE_earplugs_x_ca.paa)); icon = QUOTE(PATHTOF(UI\ACE_earplugs_x_ca.paa));
hotkey = "E"; hotkey = "E";
enableInside = 1; enableInside = 1;
}; };

4
addons/hearing/CfgWeapons.hpp
View File

@ -5,8 +5,8 @@ class CfgWeapons {
class ACE_EarBuds: ACE_ItemCore { class ACE_EarBuds: ACE_ItemCore {
displayName = "$STR_ACE_Hearing_Earbuds_Name"; displayName = "$STR_ACE_Hearing_Earbuds_Name";
descriptionShort = "$STR_ACE_Hearing_Earbuds_Description"; descriptionShort = "$STR_ACE_Hearing_Earbuds_Description";
model = QUOTE(PATHOF(ACE_earplugs.p3d); model = QUOTE(PATHTOF(ACE_earplugs.p3d));
picture = QUOTE(PATHOF(UI\ACE_earplugs_x_ca.paa); picture = QUOTE(PATHTOF(UI\ACE_earplugs_x_ca.paa));
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: InventoryItem_Base_F {
mass = 1; mass = 1;

2
addons/hearing/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {"ACE_EarBuds"}; weapons[] = {"ACE_EarBuds"};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"}; requiredAddons[] = {"ace_common", "ace_interaction"};
author[] = {"KoffeinFlummi", "CAA-Picard", "HopeJ", "commy2"}; author[] = {"KoffeinFlummi", "CAA-Picard", "HopeJ", "commy2"};
authorUrl = "https://github.com/KoffeinFlummi/"; authorUrl = "https://github.com/KoffeinFlummi/";
VERSION_CONFIG; VERSION_CONFIG;

2
addons/hearing/functions/fnc_addEarPlugs.sqf
View File

@ -9,7 +9,7 @@
* Return value: * Return value:
* Nothing * Nothing
*/ */
#include "\z\ace\addons\hearing\script_component.hpp" #include "script_component.hpp"
private ["_unit", "_launcher"]; private ["_unit", "_launcher"];

2
addons/hearing/functions/fnc_earRinging.sqf
View File

@ -9,7 +9,7 @@
* Return Value: * Return Value:
* none * none
*/ */
#include "\z\ace\addons\hearing\script_component.hpp" #include "script_component.hpp"
private ["_unit", "_strength"]; private ["_unit", "_strength"];

2
addons/hearing/functions/fnc_explosionNear.sqf
View File

@ -9,7 +9,7 @@
* Return Value: * Return Value:
* none * none
*/ */
#include "\z\ace\addons\hearing\script_component.hpp" #include "script_component.hpp"
private ["_unit", "_damage", "_strength"]; private ["_unit", "_damage", "_strength"];

2
addons/hearing/functions/fnc_firedNear.sqf
View File

@ -9,7 +9,7 @@
* Return Value: * Return Value:
* none * 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"]; private ["_unit", "_firer", "_distance", "_weapon", "_muzzle", "_mode", "_ammo", "_silencer", "_audibleFireCoef", "_loudness", "_strength"];

2
addons/hearing/functions/fnc_hasEarPlugsIn.sqf
View File

@ -9,7 +9,7 @@
* Return value: * Return value:
* Boolean (Bool) * Boolean (Bool)
*/ */
#include "\z\ace\addons\hearing\script_component.hpp" #include "script_component.hpp"
private "_unit"; private "_unit";

2
addons/hearing/functions/fnc_putInEarplugs.sqf
View File

@ -10,7 +10,7 @@
* Return Value: * Return Value:
* none * none
*/ */
#include "\z\ace\addons\hearing\script_component.hpp" #include "script_component.hpp"
private "_player"; private "_player";

2
addons/hearing/functions/fnc_removeEarplugs.sqf
View File

@ -10,7 +10,7 @@
* Return Value: * Return Value:
* none * none
*/ */
#include "\z\ace\addons\hearing\script_component.hpp" #include "script_component.hpp"
private "_player"; private "_player";

1
addons/hearing/functions/script_component.hpp Normal file
View File

@ -0,0 +1 @@
#include "\z\ace\addons\hearing\script_component.hpp"

12
addons/hearing/script_component.hpp Normal file
View File

@ -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"