mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-13 19:52:38 +03:00
Skip gear sound in player_forceSave
Don't play sound when gear flashes open momentarily for force save and
backpack mag ammo count.
Vanilla commit:
98784aae79
This commit is contained in:
@@ -15,6 +15,7 @@ _created = false;
|
|||||||
if ( isNull _dialog ) then {
|
if ( isNull _dialog ) then {
|
||||||
//startLoadingScreen [""];
|
//startLoadingScreen [""];
|
||||||
DZE_GearCheckBypass = true; //Bypass gear menu checks since dialog will always open on player's gear
|
DZE_GearCheckBypass = true; //Bypass gear menu checks since dialog will always open on player's gear
|
||||||
|
skipGearSound = true; //Don't play sound for force save
|
||||||
createGearDialog [player, "RscDisplayGear"];
|
createGearDialog [player, "RscDisplayGear"];
|
||||||
_dialog = findDisplay 106;
|
_dialog = findDisplay 106;
|
||||||
_created = true;
|
_created = true;
|
||||||
@@ -54,6 +55,7 @@ for "_i" from 122 to 129 do
|
|||||||
|
|
||||||
if ( _created ) then {
|
if ( _created ) then {
|
||||||
closeDialog 0;
|
closeDialog 0;
|
||||||
|
skipGearSound = false;
|
||||||
//endLoadingScreen;
|
//endLoadingScreen;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
if (skipGearSound) exitWith {};
|
||||||
|
|
||||||
private["_type"];
|
private["_type"];
|
||||||
_type="open_inventory";
|
_type="open_inventory";
|
||||||
if( (!isNull cursorTarget) && (player distance cursorTarget < 5) && (vehicle player == player) ) then {
|
if( (!isNull cursorTarget) && (player distance cursorTarget < 5) && (vehicle player == player) ) then {
|
||||||
|
|||||||
@@ -358,6 +358,7 @@ if (!isDedicated) then {
|
|||||||
closeDialog 0;
|
closeDialog 0;
|
||||||
if (gear_done) then {sleep 0.001;};
|
if (gear_done) then {sleep 0.001;};
|
||||||
DZE_GearCheckBypass = true; //Bypass gear menu checks since dialog will always open on player's gear
|
DZE_GearCheckBypass = true; //Bypass gear menu checks since dialog will always open on player's gear
|
||||||
|
skipGearSound = true; //Don't play sound when checking backpack mags ammo count
|
||||||
player action ["Gear", player];
|
player action ["Gear", player];
|
||||||
if (gear_done) then {sleep 0.001;};
|
if (gear_done) then {sleep 0.001;};
|
||||||
_dialog = findDisplay 106;
|
_dialog = findDisplay 106;
|
||||||
@@ -369,6 +370,7 @@ if (!isDedicated) then {
|
|||||||
if (_i in [100,200,299]) then {
|
if (_i in [100,200,299]) then {
|
||||||
closeDialog 0;
|
closeDialog 0;
|
||||||
DZE_GearCheckBypass = true; //Bypass gear menu checks since dialog will always open on player's gear
|
DZE_GearCheckBypass = true; //Bypass gear menu checks since dialog will always open on player's gear
|
||||||
|
skipGearSound = true; //Don't play sound when checking backpack mags ammo count
|
||||||
player action ["Gear", player];
|
player action ["Gear", player];
|
||||||
};
|
};
|
||||||
if (_i > 300) exitWith {};
|
if (_i > 300) exitWith {};
|
||||||
@@ -382,6 +384,7 @@ if (!isDedicated) then {
|
|||||||
sleep 0.001;
|
sleep 0.001;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
skipGearSound = false;
|
||||||
_dialog
|
_dialog
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -539,7 +539,6 @@ if (isNil "DZE_selfTransfuse_Values") then {DZE_selfTransfuse_Values = [12000,15
|
|||||||
if (isNil "DZE_PlotPole") then {DZE_PlotPole = [30,45];};
|
if (isNil "DZE_PlotPole") then {DZE_PlotPole = [30,45];};
|
||||||
DZE_maintainRange = ((DZE_PlotPole select 0)+20);
|
DZE_maintainRange = ((DZE_PlotPole select 0)+20);
|
||||||
if (isNil "DZE_slowZombies") then {DZE_slowZombies = false;};
|
if (isNil "DZE_slowZombies") then {DZE_slowZombies = false;};
|
||||||
TimeOutDisplayed = false;
|
|
||||||
|
|
||||||
if (isServer) then {
|
if (isServer) then {
|
||||||
dayz_traps = [];
|
dayz_traps = [];
|
||||||
@@ -663,6 +662,8 @@ if (!isDedicated) then {
|
|||||||
dayz_getout = objNull;
|
dayz_getout = objNull;
|
||||||
dayz_getoutTime = 0;
|
dayz_getoutTime = 0;
|
||||||
dayz_HitBy = objNull;
|
dayz_HitBy = objNull;
|
||||||
|
skipGearSound = false;
|
||||||
|
TimeOutDisplayed = false;
|
||||||
voice_actions = ["voiceOverNet","PushToTalk","PushToTalkAll","PushToTalkCommand","PushToTalkDirect","PushToTalkGroup","PushToTalkSide","PushToTalkVehicle"];
|
voice_actions = ["voiceOverNet","PushToTalk","PushToTalkAll","PushToTalkCommand","PushToTalkDirect","PushToTalkGroup","PushToTalkSide","PushToTalkVehicle"];
|
||||||
|
|
||||||
// EPOCH ADDITIONS
|
// EPOCH ADDITIONS
|
||||||
|
|||||||
Reference in New Issue
Block a user