From 93d6c85dbc695f6abe5c7c0dce48727867151e57 Mon Sep 17 00:00:00 2001
From: ebayShopper <ebayShopper@users.noreply.github.com>
Date: Mon, 20 Mar 2017 17:26:41 -0400
Subject: [PATCH] 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:

https://github.com/DayZMod/DayZ/commit/98784aae797cc50978ad848b8ee9b4f70aad231f
---
 SQF/dayz_code/compile/player_countMagazines.sqf | 2 ++
 SQF/dayz_code/compile/ui_gear_sound.sqf         | 2 ++
 SQF/dayz_code/init/compiles.sqf                 | 3 +++
 SQF/dayz_code/init/variables.sqf                | 3 ++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/SQF/dayz_code/compile/player_countMagazines.sqf b/SQF/dayz_code/compile/player_countMagazines.sqf
index 66f300ca3..fe80eeffe 100644
--- a/SQF/dayz_code/compile/player_countMagazines.sqf
+++ b/SQF/dayz_code/compile/player_countMagazines.sqf
@@ -15,6 +15,7 @@ _created = false;
 if ( isNull _dialog ) then {
 	//startLoadingScreen [""];
 	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"];
 	_dialog = findDisplay 106;
 	_created = true;
@@ -54,6 +55,7 @@ for "_i" from 122 to 129 do
 
 if ( _created ) then {
 	closeDialog 0;
+	skipGearSound = false;
 	//endLoadingScreen;
 };
 
diff --git a/SQF/dayz_code/compile/ui_gear_sound.sqf b/SQF/dayz_code/compile/ui_gear_sound.sqf
index 7fe176ffe..ed27d316c 100644
--- a/SQF/dayz_code/compile/ui_gear_sound.sqf
+++ b/SQF/dayz_code/compile/ui_gear_sound.sqf
@@ -1,3 +1,5 @@
+if (skipGearSound) exitWith {};
+
 private["_type"];
 _type="open_inventory";
 if( (!isNull cursorTarget) && (player distance cursorTarget < 5) && (vehicle player == player) ) then {
diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf
index a80fda9de..cac335325 100644
--- a/SQF/dayz_code/init/compiles.sqf
+++ b/SQF/dayz_code/init/compiles.sqf
@@ -358,6 +358,7 @@ if (!isDedicated) then {
 		closeDialog 0;
 		if (gear_done) then {sleep 0.001;};
 		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];
 		if (gear_done) then {sleep 0.001;};
 		_dialog = findDisplay 106;
@@ -369,6 +370,7 @@ if (!isDedicated) then {
 			if (_i in [100,200,299]) then {
 				closeDialog 0;
 				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];
 			};
 			if (_i > 300) exitWith {};
@@ -382,6 +384,7 @@ if (!isDedicated) then {
 				sleep 0.001;
 			};
 		};
+		skipGearSound = false;
 		_dialog
 	};
 
diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf
index 29b062d5a..9736ae21c 100644
--- a/SQF/dayz_code/init/variables.sqf
+++ b/SQF/dayz_code/init/variables.sqf
@@ -539,7 +539,6 @@ if (isNil "DZE_selfTransfuse_Values") then {DZE_selfTransfuse_Values = [12000,15
 if (isNil "DZE_PlotPole") then {DZE_PlotPole = [30,45];};
 DZE_maintainRange = ((DZE_PlotPole select 0)+20);
 if (isNil "DZE_slowZombies") then {DZE_slowZombies = false;};
-TimeOutDisplayed = false;
 
 if (isServer) then {
 	dayz_traps = [];
@@ -663,6 +662,8 @@ if (!isDedicated) then {
 	dayz_getout = objNull;
 	dayz_getoutTime = 0;
 	dayz_HitBy = objNull;
+	skipGearSound = false;
+	TimeOutDisplayed = false;
 	voice_actions = ["voiceOverNet","PushToTalk","PushToTalkAll","PushToTalkCommand","PushToTalkDirect","PushToTalkGroup","PushToTalkSide","PushToTalkVehicle"];
 
 	// EPOCH ADDITIONS