-
Notifications
You must be signed in to change notification settings - Fork 739
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Hearing - Fix explosions not affecting hearing #10002
Merged
johnb432
merged 10 commits into
master
from
hearing-fix-explosions-not-affecting-hearing
Aug 12, 2024
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
589c857
Have explosions affect hearing
johnb432 ba7cbbc
Update fnc_explosion.sqf
johnb432 034fea9
Update XEH_postInit.sqf
johnb432 cc9e88d
Merge branch 'master' into hearing-fix-explosions-not-affecting-hearing
johnb432 ef5d2da
Update addons/hearing/functions/fnc_explosion.sqf
johnb432 8fa9165
Update fnc_explosion.sqf
johnb432 e1310f5
Merge branch 'master' into hearing-fix-explosions-not-affecting-hearing
johnb432 d13d487
Make EH local
johnb432 54f5259
Use sound entry instead
johnb432 0b8c3ab
Merge branch 'master' into hearing-fix-explosions-not-affecting-hearing
johnb432 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
#include "..\script_component.hpp" | ||
/* | ||
* Author: johnb43 | ||
* Handles deafness due to explosions going off near the player. | ||
* | ||
* Arguments: | ||
* 0: Projectile <OBJECT> | ||
* 1: Explosion position ASL <ARRAY> | ||
* 2: Velocity <ARRAY> (unused) | ||
* | ||
* Return Value: | ||
* None | ||
* | ||
* Example: | ||
* [_projectile, [0, 0, 0], [0, 0, 0]] call ace_hearing_fnc_explosion | ||
* | ||
* Public: No | ||
*/ | ||
|
||
// Ignore spectators, curators and alike | ||
if ((getNumber (configOf ACE_player >> "isPlayableLogic")) == 1) exitWith {}; | ||
|
||
params ["_projectile", "_pos"]; | ||
|
||
// Don't allow for distances under 1 | ||
private _distance = ((eyePos ACE_player) vectorDistance _pos) max 1; | ||
johnb432 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// Fast exit if explosion far away | ||
if (_distance > 100) exitWith { | ||
TRACE_1("too far away",_distance); | ||
}; | ||
|
||
private _ammoConfig = configOf _projectile; | ||
private _explosive = getNumber (_ammoConfig >> "explosive"); | ||
|
||
private _vehAttenuation = [GVAR(playerVehAttenuation), 1] select (isNull objectParent ACE_player || {isTurnedOut ACE_player}); | ||
|
||
TRACE_5("",typeOf _projectile,_distance,_explosive,_audibleFire,_vehAttenuation); | ||
|
||
(if (isArray (_ammoConfig >> "soundHit1")) then { | ||
getArray (_ammoConfig >> "soundHit1") | ||
} else { | ||
getArray (_ammoConfig >> "soundHit") | ||
}) params ["", ["_volume", 1], "", ["_maxDistance", 1500]]; | ||
|
||
if (_distance > _maxDistance) exitWith { | ||
TRACE_2("too far away",_distance,_maxDistance); | ||
}; | ||
|
||
private _strength = _vehAttenuation * _explosive * _volume * _maxDistance / _distance^2; | ||
|
||
TRACE_2("strength",_volume,_strength); | ||
|
||
// Call immediately, as it will get picked up later by the update thread anyway | ||
_strength call FUNC(earRinging); |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can be moved to common, if the frag rewrite needs it.