Browse Source

Merge f6d15d2a8f into 5a08031caf

pull/7065/merge
Tully-B 4 days ago committed by GitHub
parent
commit
2feaccecb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      Source/gmenu.cpp
  2. 4
      Source/utils/soundsample.cpp

8
Source/gmenu.cpp

@ -362,7 +362,13 @@ bool gmenu_left_mouse(bool isDown)
return true; return true;
} }
sgpCurrItem = pItem; sgpCurrItem = pItem;
PlaySFX(SfxID::MenuMove);
// Do not play a duplicate sound if we are clicking on the sound slider.
// CurrentMenuId == 5 is the options menu, i == 1 is the sound slider.
if ((sgCurrentMenuIdx != 5) || (i != 1)) {
PlaySFX(SfxID::MenuMove);
}
if (pItem->isSlider()) { if (pItem->isSlider()) {
isDraggingSlider = GmenuMouseIsOverSlider(); isDraggingSlider = GmenuMouseIsOverSlider();
gmenu_on_mouse_move(); gmenu_on_mouse_move();

4
Source/utils/soundsample.cpp

@ -43,9 +43,9 @@ constexpr float VolumeScale = 3321.9281F;
/** /**
* Min and max volume range, in millibel. * Min and max volume range, in millibel.
* -100 dB (muted) to 0 dB (max. loudness). * -60 dB (muted) to 0 dB (max. loudness).
*/ */
constexpr float MillibelMin = -10000.F; constexpr float MillibelMin = -6000.F;
constexpr float MillibelMax = 0.F; constexpr float MillibelMax = 0.F;
/** /**

Loading…
Cancel
Save