david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #439 from DanielNoord/fix/gamesound (#437)

Browse Source 
Incorporated the general game volume in calculation of notifications volumes
This commit is contained in:
DanielNoord
2020-12-13 22:14:36 +01:00
committed by GitHub
parent f398aa9564 b80d2b63e8
commit 6098a398f0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CookieMonster.js
View File

@@ -1884,7 +1884,7 @@ CM.Disp.Flash = function(mode, config) {
CM.Disp.PlaySound = function(url, sndConfig, volConfig) { CM.Disp.PlaySound = function(url, sndConfig, volConfig) {
if (CM.Config[sndConfig] == 1) { if (CM.Config[sndConfig] == 1) {
var sound = new realAudio(url); var sound = new realAudio(url);
sound.volume = CM.Config[volConfig] / 100; sound.volume = (CM.Config[volConfig] / 100) * (Game.volume / 100);
sound.play(); sound.play();
} }
} }

2
src/Disp.js
View File

@@ -980,7 +980,7 @@ CM.Disp.Flash = function(mode, config) {
CM.Disp.PlaySound = function(url, sndConfig, volConfig) { CM.Disp.PlaySound = function(url, sndConfig, volConfig) {
if (CM.Config[sndConfig] == 1) { if (CM.Config[sndConfig] == 1) {
var sound = new realAudio(url); var sound = new realAudio(url);
sound.volume = CM.Config[volConfig] / 100; sound.volume = (CM.Config[volConfig] / 100) * (Game.volume / 100);
sound.play(); sound.play();
} }
} }