W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add handling of other fadeSound events in player_toggleMuteSound

Browse Source 
Fixes icon staying up after fadeSound to 1 by unconscious and low blood
events.
This commit is contained in:
ebaydayz
2016-07-20 17:36:40 -04:00
parent f314a39e43
commit 2f844060ec
6 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/compile/fn_buildCamera.sqf
View File

@@ -1,5 +1,7 @@
if (0 != count Dayz_constructionContext) then { if (0 != count Dayz_constructionContext) then {
if (dayz_soundMuted) then {call player_toggleSoundMute;}; // disable before fadeSound
if (!(Dayz_constructionContext select 3)) then { if (!(Dayz_constructionContext select 3)) then {
_ghost = Dayz_constructionContext select 0; _ghost = Dayz_constructionContext select 0;
if (abs(([_ghost, player] call BIS_fnc_distance2D) - (1 + (sizeOf (typeOf _ghost)) * 0.5)) < 1) then { if (abs(([_ghost, player] call BIS_fnc_distance2D) - (1 + (sizeOf (typeOf _ghost)) * 0.5)) < 1) then {

1
SQF/dayz_code/compile/fn_unconscious.sqf
View File

@@ -27,6 +27,7 @@ autoRunActive = false;
player playAction "CanNotMove"; player playAction "CanNotMove";
"dynamicBlur" ppEffectEnable true;"dynamicBlur" ppEffectAdjust [2]; "dynamicBlur" ppEffectCommit 0; "dynamicBlur" ppEffectEnable true;"dynamicBlur" ppEffectAdjust [2]; "dynamicBlur" ppEffectCommit 0;
"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 0.1], [1, 1, 1, 0.0]];"colorCorrections" ppEffectCommit 0; "colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 0.1], [1, 1, 1, 0.0]];"colorCorrections" ppEffectCommit 0;
if (dayz_soundMuted) then {call player_toggleSoundMute;}; // hide icon before fadeSound
0 fadeSound 0.05; 0 fadeSound 0.05;
while { (diag_tickTime - _start) < _timeout and r_player_unconscious and alive player } do { while { (diag_tickTime - _start) < _timeout and r_player_unconscious and alive player } do {

1
SQF/dayz_code/compile/player_death.sqf
View File

@@ -56,6 +56,7 @@ publicVariableServer "PVDZ_plr_Death";
_id = [player,20,true,getPosATL player] call player_alertZombies; _id = [player,20,true,getPosATL player] call player_alertZombies;
uiSleep 0.5; uiSleep 0.5;
player setDamage 1; player setDamage 1;
if (dayz_soundMuted) then {call player_toggleSoundMute;}; // hide icon before fadeSound
0.1 fadeSound 0; 0.1 fadeSound 0;
player setVariable ["NORRN_unconscious", false, true]; player setVariable ["NORRN_unconscious", false, true];

2
SQF/dayz_code/compile/player_toggleSoundMute.sqf
View File

@@ -9,7 +9,7 @@ if (!isNil "_display") then {
if (dayz_soundMuted) then { if (dayz_soundMuted) then {
dayz_soundMuted = false; dayz_soundMuted = false;
1 fadeSound 1; if (!r_player_unconscious && !deathHandled && !r_pitchWhine) then {1 fadeSound 1;};
_background ctrlShow false; _background ctrlShow false;
_icon ctrlShow false; _icon ctrlShow false;
} else { } else {

5
SQF/dayz_code/medical/init_medical.sqf
View File

@@ -8,7 +8,10 @@ while {1==1} do {
playSound "heartbeat_1"; playSound "heartbeat_1";
addCamShake [2, 0.5, 25]; addCamShake [2, 0.5, 25];
if (r_player_lowblood) then { if (r_player_lowblood) then {
0 fadeSound ((r_player_blood/r_player_bloodTotal) + 0.5); if (!dayz_soundMuted) then {
// muted is 0.25, so this is always higher
0 fadeSound ((r_player_blood/r_player_bloodTotal) + 0.5);
};
"dynamicBlur" ppEffectEnable true;"dynamicBlur" ppEffectAdjust [4]; "dynamicBlur" ppEffectCommit 0.2; "dynamicBlur" ppEffectEnable true;"dynamicBlur" ppEffectAdjust [4]; "dynamicBlur" ppEffectCommit 0.2;
}; };
uiSleep 0.5; uiSleep 0.5;

6
SQF/dayz_code/medical/setup_functions_med.sqf
View File

@@ -19,7 +19,11 @@ fnc_usec_pitchWhine = {
playMusic ["PitchWhine",0]; playMusic ["PitchWhine",0];
if (!r_player_unconscious) then { if (!r_player_unconscious) then {
_visual call fnc_usec_bulletHit; _visual call fnc_usec_bulletHit;
_sound fadeSound 1; if (dayz_soundMuted) then {
_sound fadeSound 0.25;
} else {
_sound fadeSound 1;
};
}; };
r_pitchWhine = true; r_pitchWhine = true;
[] spawn { [] spawn {