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

fix playSoundInjured wrong args

Browse Source
This commit is contained in:
commy2 2016-09-30 13:03:43 +02:00
parent 6ae57e991f
commit c93e9e3f3b
7 changed files with 13 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/medical/functions/fnc_handleStateDefault.sqf
View File

@ -22,5 +22,5 @@ systemChat format["handling state default for unit: %1", _this];
private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
[_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
[_unit, "moan", PAIN_TO_MOAN(_pain)] call EFUNC(medical_engine,playInjuredSound);
};

2
addons/medical/functions/fnc_handleStateInjured.sqf
View File

@ -20,5 +20,5 @@ if (!local _unit) exitWith {
private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
[_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
[_unit, "moan", PAIN_TO_MOAN(_pain)] call EFUNC(medical_engine,playInjuredSound);
};

2
addons/medical/functions/fnc_handleStateRevive.sqf
View File

@ -51,5 +51,5 @@ if (GVAR(level) >= 2) then {
private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
[_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
[_unit, "moan", PAIN_TO_MOAN(_pain)] call EFUNC(medical_engine,playInjuredSound);
};

2
addons/medical/functions/fnc_handleStateUnconscious.sqf
View File

@ -20,5 +20,5 @@ if (!local _unit) exitWith {
private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
[_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
[_unit, "moan", PAIN_TO_MOAN(_pain)] call EFUNC(medical_engine,playInjuredSound);
};

81
addons/medical/functions/fnc_playInjuredSound.sqf
View File

@ -1,81 +0,0 @@
/*
* Author: Glowbal
* Play the injured sound for a unit if the unit is damaged. The sound broadcasted across MP.
* Will not play if the unit has already played a sound within to close a time frame.
* Delay: With minimal damage (below 1), the delay is (10 + random(50)) seconds. Otherwise it is 60 seconds / damage.
*
* Arguments:
* 0: The Unit <OBJECT>
* 1: Amount of Pain <NUMBER>
*
* ReturnValue:
* None
*
* Public: No
*/
#include "script_component.hpp"
params ["_unit", "_pain"];
if (!local _unit || !GVAR(enableScreams)) exitWith{};
// Lock if the unit is already playing a sound.
if ((_unit getVariable [QGVAR(playingInjuredSound),false])) exitWith {};
_unit setVariable [QGVAR(playingInjuredSound),true];
// Play the sound if there is any damage present.
if (_pain > 0 && {[_unit] call EFUNC(common,isAwake)}) exitWith {
// Classnames of the available sounds.
private _availableSounds_A = [
"WoundedGuyA_01",
"WoundedGuyA_02",
"WoundedGuyA_03",
"WoundedGuyA_04",
"WoundedGuyA_05",
"WoundedGuyA_06",
"WoundedGuyA_07",
"WoundedGuyA_08"
];
private _availableSounds_B = [
"WoundedGuyB_01",
"WoundedGuyB_02",
"WoundedGuyB_03",
"WoundedGuyB_04",
"WoundedGuyB_05",
"WoundedGuyB_06",
"WoundedGuyB_07",
"WoundedGuyB_08"
];
private _availableSounds_C = [
"WoundedGuyC_01",
"WoundedGuyC_02",
"WoundedGuyC_03",
"WoundedGuyC_04",
"WoundedGuyC_05"
];
private _sound = "";
// Select the to be played sound based upon damage amount.
if (_pain > 0.5) then {
if (random(1) > 0.5) then {
_sound = selectRandom _availableSounds_A;
} else {
_sound = selectRandom _availableSounds_B;
};
} else {
_sound = selectRandom _availableSounds_B;
};
// Play the sound
playSound3D [(getArray(configFile >> "CfgSounds" >> _sound >> "sound") select 0) + ".wss", objNull, false, getPos _unit, 15, 1, 25]; // +2db, 15 meters.
// Figure out what the delay will be before it is possible to play a sound again.
private _delay = (30 - (random(25) * _pain)) max (3.5 + random(2));
// Clean up the lock
[{
(_this select 0) setVariable [QGVAR(playingInjuredSound), nil];
}, [_unit], _delay, _delay] call CBA_fnc_waitAndExecute;
};
// Clean up in case there has not been played any sounds.
_unit setVariable [QGVAR(playingInjuredSound), nil];

4
addons/medical/script_component.hpp
View File

@ -16,3 +16,7 @@
#endif
#include "\z\ace\addons\main\script_macros.hpp"
// scale received pain to 0-2 level to select type of scream
// below 0.33: 0, from 0.34 to 0.66: 1, more than 0.67: 2
#define PAIN_TO_MOAN(pain) (floor (3 * pain) min 2)

7
addons/medical_engine/functions/fnc_playInjuredSound.sqf
View File

@ -18,7 +18,8 @@
*/
#include "script_component.hpp"
#define TIME_OUT 1
#define TIME_OUT_HIT 1
#define TIME_OUT_MOAN 5
params [["_unit", objNull, [objNull]], ["_type", "hit", [""]], ["_severity", 0, [0]]];
TRACE_3("",_unit,_type,_severity);
@ -27,9 +28,11 @@ if (!local _unit) exitWith {
ACE_LOGERROR("Unit not local or null");
};
private _timeOut = [TIME_OUT_HIT, TIME_OUT_MOAN] select (_type == "moan");
// Handle timeout
if (_unit getVariable [QGVAR(soundTimeout), -1] > CBA_missionTime) exitWith {};
_unit setVariable [QGVAR(soundTimeout), CBA_missionTime + TIME_OUT];
_unit setVariable [QGVAR(soundTimeout), CBA_missionTime + _timeOut];
// Get sounds
private _soundsNamespace = NAMESPACE_NULL;