2 months ago · 7d68bb5ab7
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ HEADERS = $(shell find src -type f -name '*.h')
 
 
 
 LIBS = blkid freetype2 glew libenet libjpeg liblzma xi zlib
 
 
 
-CXXFLAGS = -std=c++17 -fmessage-length=0 -Wno-sign-compare -Wno-unused-local-typedefs -Wno-reorder -Wno-switch -Wall
 
+CXXFLAGS = -std=c++17 -fmessage-length=0 -fno-exceptions -Wno-sign-compare -Wno-unused-local-typedefs -Wno-reorder -Wno-switch -Wall
 
 CXXFLAGS += `pkgconf --static --cflags $(LIBS)` `curl-config --cflags`
 
 CXXFLAGS += -Isrc/App -Isrc/App/Osu -Isrc/Engine -Isrc/GUI -Isrc/GUI/Windows -Isrc/GUI/Windows/VinylScratcher -Isrc/Engine/Input -Isrc/Engine/Platform -Isrc/Engine/Main -Isrc/Engine/Renderer -Isrc/Util
 
 CXXFLAGS += -Ilibraries/bass/include -Ilibraries/bassasio/include -Ilibraries/bassfx/include -Ilibraries/bassmix/include -Ilibraries/basswasapi/include -Ilibraries/bassloud/include
--- a/src/App/Osu/Changelog.cpp
+++ b/src/App/Osu/Changelog.cpp
@@ -346,7 +346,7 @@ void Changelog::updateLayout() {
 
 }
 
 
 
 void Changelog::onBack() {
 
-    engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+    engine->getSound()->play(osu->getSkin()->m_menuBack);
 
 
 
     osu->toggleChangelog();
 
 }
--- a/src/App/Osu/Database.cpp
+++ b/src/App/Osu/Database.cpp
@@ -1241,11 +1241,8 @@ void Database::loadDB(Packet *db, bool &fallbackToRawLoad) {
 
             if(pathTokens.size() > 0 && pathTokens[0].length() > 0) {
 
                 const std::vector<UString> spaceTokens = pathTokens[0].split(" ");
 
                 if(spaceTokens.size() > 0 && spaceTokens[0].length() > 0) {
 
-                    try {
 
-                        beatmapSetID = spaceTokens[0].toInt();
 
-                    } catch(...) {
 
-                        beatmapSetID = -1;
 
-                    }
 
+                    beatmapSetID = spaceTokens[0].toInt();
 
+                    if(beatmapSetID == 0) beatmapSetID = -1;
 
                 }
 
             }
 
         }
--- a/src/App/Osu/MainMenu.cpp
+++ b/src/App/Osu/MainMenu.cpp
@@ -29,6 +29,8 @@
 
 #include "UpdateHandler.h"
 
 #include "VertexArrayObject.h"
 
 
 
+static float button_sound_cooldown = 0.f;
 
+
 
 using namespace std;
 
 
 
 UString MainMenu::NEOSU_MAIN_BUTTON_TEXT = UString("neosu");
@@ -1423,7 +1425,10 @@ void MainMenuCubeButton::onMouseInside() {
 
 
 
     CBaseUIButton::onMouseInside();
 
 
 
-    engine->getSound()->play(osu->getSkin()->m_hoverMainMenuCube);
 
+    if(button_sound_cooldown + 0.05f < engine->getTime()) {
 
+        engine->getSound()->play(osu->getSkin()->m_hoverMainMenuCube);
 
+        button_sound_cooldown = engine->getTime();
 
+    }
 
 }
 
 
 
 void MainMenuCubeButton::onMouseOutside() {
@@ -1447,13 +1452,17 @@ void MainMenuButton::onMouseInside() {
 
     if(m_mainMenu->m_cube->isMouseInside()) return;
 
     CBaseUIButton::onMouseInside();
 
 
 
-    if(getName() == UString("Singleplayer")) {
 
-        engine->getSound()->play(osu->getSkin()->m_hoverSingleplayer);
 
-    } else if(getName() == UString("Multiplayer")) {
 
-        engine->getSound()->play(osu->getSkin()->m_hoverMultiplayer);
 
-    } else if(getName() == UString("Options")) {
 
-        engine->getSound()->play(osu->getSkin()->m_hoverOptions);
 
-    } else if(getName() == UString("Exit")) {
 
-        engine->getSound()->play(osu->getSkin()->m_hoverExit);
 
+    if(button_sound_cooldown + 0.05f < engine->getTime()) {
 
+        if(getText() == UString("Singleplayer")) {
 
+            engine->getSound()->play(osu->getSkin()->m_hoverSingleplayer);
 
+        } else if(getText() == UString("Multiplayer")) {
 
+            engine->getSound()->play(osu->getSkin()->m_hoverMultiplayer);
 
+        } else if(getText() == UString("Options (CTRL + O)")) {
 
+            engine->getSound()->play(osu->getSkin()->m_hoverOptions);
 
+        } else if(getText() == UString("Exit")) {
 
+            engine->getSound()->play(osu->getSkin()->m_hoverExit);
 
+        }
 
+
 
+        button_sound_cooldown = engine->getTime();
 
     }
 
 }
--- a/src/App/Osu/OptionsMenu.cpp
+++ b/src/App/Osu/OptionsMenu.cpp
@@ -2215,7 +2215,7 @@ void OptionsMenu::updateLayout() {
 
 void OptionsMenu::onBack() {
 
     osu->getNotificationOverlay()->stopWaitingForKey();
 
 
 
-    engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+    engine->getSound()->play(osu->getSkin()->m_menuBack);
 
     save();
 
 
 
     if(m_bFullscreen)
--- a/src/App/Osu/PauseMenu.cpp
+++ b/src/App/Osu/PauseMenu.cpp
@@ -173,8 +173,6 @@ void PauseMenu::onSelectionChange() {
 
             m_fWarningArrowsAnimX = m_selectedButton->getPos().x;
 
 
 
         anim->moveQuadOut(&m_fWarningArrowsAnimY, m_selectedButton->getPos().y, 0.1f);
 
-
 
-        engine->getSound()->play(osu->getSkin()->getMenuClick());
 
     }
 
 }
 
 
@@ -338,12 +336,15 @@ void PauseMenu::onResolutionChange(Vector2 newResolution) {
 
 CBaseUIContainer *PauseMenu::setVisible(bool visible) {
 
     m_bVisible = visible;
 
 
 
-    if(osu->isInPlayMode())
 
+    if(osu->isInPlayMode()) {
 
         setContinueEnabled(!osu->getSelectedBeatmap()->hasFailed());
 
-    else
 
+    } else {
 
         setContinueEnabled(true);
 
+    }
 
 
 
     if(visible) {
 
+        engine->getSound()->play(osu->getSkin()->m_pauseLoop);
 
+
 
         if(m_bContinueEnabled) {
 
             RichPresence::setStatus("Paused");
 
             RichPresence::setBanchoStatus("Taking a break", PAUSED);
@@ -362,6 +363,8 @@ CBaseUIContainer *PauseMenu::setVisible(bool visible) {
 
             RichPresence::setBanchoStatus("Failed", SUBMITTING);
 
         }
 
     } else {
 
+        engine->getSound()->stop(osu->getSkin()->m_pauseLoop);
 
+
 
         RichPresence::onPlayStart();
 
 
 
         if(!bancho.spectators.empty()) {
--- a/src/App/Osu/RankingScreen.cpp
+++ b/src/App/Osu/RankingScreen.cpp
@@ -638,7 +638,7 @@ void RankingScreen::updateLayout() {
 
 }
 
 
 
 void RankingScreen::onBack() {
 
-    engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+    engine->getSound()->play(osu->getSkin()->m_menuBack);
 
 
 
     // stop applause sound
 
     if(osu->getSkin()->getApplause() != NULL && osu->getSkin()->getApplause()->isPlaying())
--- a/src/App/Osu/Skin.cpp
+++ b/src/App/Osu/Skin.cpp
@@ -8,6 +8,7 @@
 
 #include "Environment.h"
 
 #include "File.h"
 
 #include "GameRules.h"
 
+#include "LinuxEnvironment.h"
 
 #include "NotificationOverlay.h"
 
 #include "Osu.h"
 
 #include "ResourceManager.h"
@@ -225,7 +226,7 @@ Skin::Skin(UString name, std::string filepath, bool isDefaultSkin) {
 
     m_failsound = NULL;
 
     m_applause = NULL;
 
     m_menuHit = NULL;
 
-    m_menuClick = NULL;
 
+    m_menuHover = NULL;
 
     m_checkOn = NULL;
 
     m_checkOff = NULL;
 
     m_shutter = NULL;
@@ -829,28 +830,30 @@ void Skin::load() {
 
     // sounds
 
 
 
     // samples
 
-    checkLoadSound(&m_normalHitNormal, "normal-hitnormal", "OSU_SKIN_NORMALHITNORMAL_SND", true, true, false, 0.8f);
 
-    checkLoadSound(&m_normalHitWhistle, "normal-hitwhistle", "OSU_SKIN_NORMALHITWHISTLE_SND", true, true, false, 0.85f);
 
+    checkLoadSound(&m_normalHitNormal, "normal-hitnormal", "OSU_SKIN_NORMALHITNORMAL_SND", true, true, false, true,
 
+                   0.8f);
 
+    checkLoadSound(&m_normalHitWhistle, "normal-hitwhistle", "OSU_SKIN_NORMALHITWHISTLE_SND", true, true, false, true,
 
+                   0.85f);
 
     checkLoadSound(&m_normalHitFinish, "normal-hitfinish", "OSU_SKIN_NORMALHITFINISH_SND", true, true);
 
-    checkLoadSound(&m_normalHitClap, "normal-hitclap", "OSU_SKIN_NORMALHITCLAP_SND", true, true, false, 0.85f);
 
+    checkLoadSound(&m_normalHitClap, "normal-hitclap", "OSU_SKIN_NORMALHITCLAP_SND", true, true, false, true, 0.85f);
 
 
 
     checkLoadSound(&m_normalSliderTick, "normal-slidertick", "OSU_SKIN_NORMALSLIDERTICK_SND", true, true);
 
     checkLoadSound(&m_normalSliderSlide, "normal-sliderslide", "OSU_SKIN_NORMALSLIDERSLIDE_SND", false, true, true);
 
     checkLoadSound(&m_normalSliderWhistle, "normal-sliderwhistle", "OSU_SKIN_NORMALSLIDERWHISTLE_SND", true, true);
 
 
 
-    checkLoadSound(&m_softHitNormal, "soft-hitnormal", "OSU_SKIN_SOFTHITNORMAL_SND", true, true, false, 0.8f);
 
-    checkLoadSound(&m_softHitWhistle, "soft-hitwhistle", "OSU_SKIN_SOFTHITWHISTLE_SND", true, true, false, 0.85f);
 
+    checkLoadSound(&m_softHitNormal, "soft-hitnormal", "OSU_SKIN_SOFTHITNORMAL_SND", true, true, false, true, 0.8f);
 
+    checkLoadSound(&m_softHitWhistle, "soft-hitwhistle", "OSU_SKIN_SOFTHITWHISTLE_SND", true, true, false, true, 0.85f);
 
     checkLoadSound(&m_softHitFinish, "soft-hitfinish", "OSU_SKIN_SOFTHITFINISH_SND", true, true);
 
-    checkLoadSound(&m_softHitClap, "soft-hitclap", "OSU_SKIN_SOFTHITCLAP_SND", true, true, false, 0.85f);
 
+    checkLoadSound(&m_softHitClap, "soft-hitclap", "OSU_SKIN_SOFTHITCLAP_SND", true, true, false, true, 0.85f);
 
 
 
     checkLoadSound(&m_softSliderTick, "soft-slidertick", "OSU_SKIN_SOFTSLIDERTICK_SND", true, true);
 
     checkLoadSound(&m_softSliderSlide, "soft-sliderslide", "OSU_SKIN_SOFTSLIDERSLIDE_SND", false, true, true);
 
     checkLoadSound(&m_softSliderWhistle, "soft-sliderwhistle", "OSU_SKIN_SOFTSLIDERWHISTLE_SND", true, true);
 
 
 
-    checkLoadSound(&m_drumHitNormal, "drum-hitnormal", "OSU_SKIN_DRUMHITNORMAL_SND", true, true, false, 0.8f);
 
-    checkLoadSound(&m_drumHitWhistle, "drum-hitwhistle", "OSU_SKIN_DRUMHITWHISTLE_SND", true, true, false, 0.85f);
 
+    checkLoadSound(&m_drumHitNormal, "drum-hitnormal", "OSU_SKIN_DRUMHITNORMAL_SND", true, true, false, true, 0.8f);
 
+    checkLoadSound(&m_drumHitWhistle, "drum-hitwhistle", "OSU_SKIN_DRUMHITWHISTLE_SND", true, true, false, true, 0.85f);
 
     checkLoadSound(&m_drumHitFinish, "drum-hitfinish", "OSU_SKIN_DRUMHITFINISH_SND", true, true);
 
-    checkLoadSound(&m_drumHitClap, "drum-hitclap", "OSU_SKIN_DRUMHITCLAP_SND", true, true, false, 0.85f);
 
+    checkLoadSound(&m_drumHitClap, "drum-hitclap", "OSU_SKIN_DRUMHITCLAP_SND", true, true, false, true, 0.85f);
 
 
 
     checkLoadSound(&m_drumSliderTick, "drum-slidertick", "OSU_SKIN_DRUMSLIDERTICK_SND", true, true);
 
     checkLoadSound(&m_drumSliderSlide, "drum-sliderslide", "OSU_SKIN_DRUMSLIDERSLIDE_SND", false, true, true);
@@ -859,38 +862,46 @@ void Skin::load() {
 
     checkLoadSound(&m_spinnerBonus, "spinnerbonus", "OSU_SKIN_SPINNERBONUS_SND", true, true);
 
     checkLoadSound(&m_spinnerSpinSound, "spinnerspin", "OSU_SKIN_SPINNERSPIN_SND", false, true, true);
 
 
 
+    // others
 
+    checkLoadSound(&m_combobreak, "combobreak", "OSU_SKIN_COMBOBREAK_SND", true, true);
 
+    checkLoadSound(&m_failsound, "failsound", "OSU_SKIN_FAILSOUND_SND");
 
+    checkLoadSound(&m_applause, "applause", "OSU_SKIN_APPLAUSE_SND");
 
+    checkLoadSound(&m_menuHit, "menuhit", "OSU_SKIN_MENUHIT_SND", true, true);
 
+    checkLoadSound(&m_menuHover, "menuclick", "OSU_SKIN_MENUCLICK_SND", true, true);
 
+    checkLoadSound(&m_checkOn, "check-on", "OSU_SKIN_CHECKON_SND", true, true);
 
+    checkLoadSound(&m_checkOff, "check-off", "OSU_SKIN_CHECKOFF_SND", true, true);
 
+    checkLoadSound(&m_shutter, "shutter", "OSU_SKIN_SHUTTER_SND", true, true);
 
+    checkLoadSound(&m_sectionPassSound, "sectionpass", "OSU_SKIN_SECTIONPASS_SND");
 
+    checkLoadSound(&m_sectionFailSound, "sectionfail", "OSU_SKIN_SECTIONFAIL_SND");
 
+
 
     // UI feedback
 
     checkLoadSound(&m_messageSent, "key-confirm", "OSU_SKIN_MESSAGE_SENT_SND", true, true, false);
 
     checkLoadSound(&m_deletingText, "key-delete", "OSU_SKIN_DELETING_TEXT_SND", true, true, false);
 
     checkLoadSound(&m_movingTextCursor, "key-movement", "OSU_MOVING_TEXT_CURSOR_SND", true, true, false);
 
     checkLoadSound(&m_typing1, "key-press-1", "OSU_TYPING_1_SND", true, true, false);
 
-    checkLoadSound(&m_typing2, "key-press-2", "OSU_TYPING_2_SND", true, true, false);
 
-    checkLoadSound(&m_typing3, "key-press-3", "OSU_TYPING_3_SND", true, true, false);
 
-    checkLoadSound(&m_typing4, "key-press-4", "OSU_TYPING_4_SND", true, true, false);
 
-    checkLoadSound(&m_backButtonClick, "back-button-click", "OSU_BACK_BUTTON_CLICK_SND", true, true, false);
 
-    checkLoadSound(&m_backButtonHover, "back-button-hover", "OSU_BACK_BUTTON_HOVER_SND", true, true, false);
 
-    checkLoadSound(&m_menuBack, "menuback", "OSU_MENU_BACK_SND", true, true, false);
 
-    checkLoadSound(&m_closeChatTab, "click-close", "OSU_CLOSE_CHAT_TAB_SND", true, true, false);
 
-    checkLoadSound(&m_hoverButton, "click-short", "OSU_HOVER_BUTTON_SND", true, true, false);
 
-    checkLoadSound(&m_clickButton, "click-short-confirm", "OSU_CLICK_BUTTON_SND", true, true, false);
 
-    checkLoadSound(&m_clickMainMenuCube, "menu-play-click", "OSU_CLICK_MAIN_MENU_CUBE_SND", true, true, false);
 
-    checkLoadSound(&m_hoverMainMenuCube, "menu-play-hover", "OSU_HOVER_MAIN_MENU_CUBE_SND", true, true, false);
 
-    checkLoadSound(&m_clickSingleplayer, "menu-freeplay-click", "OSU_CLICK_SINGLEPLAYER_SND", true, true, false);
 
-    checkLoadSound(&m_hoverSingleplayer, "menu-freeplay-hover", "OSU_HOVER_SINGLEPLAYER_SND", true, true, false);
 
-    checkLoadSound(&m_clickMultiplayer, "menu-multiplayer-click", "OSU_CLICK_MULTIPLAYER_SND", true, true, false);
 
-    checkLoadSound(&m_hoverMultiplayer, "menu-multiplayer-hover", "OSU_HOVER_MULTIPLAYER_SND", true, true, false);
 
-    checkLoadSound(&m_clickOptions, "menu-options-click", "OSU_CLICK_OPTIONS_SND", true, true, false);
 
-    checkLoadSound(&m_hoverOptions, "menu-options-hover", "OSU_HOVER_OPTIONS_SND", true, true, false);
 
-    checkLoadSound(&m_clickExit, "menu-exit-click", "OSU_CLICK_EXIT_SND", true, true, false);
 
-    checkLoadSound(&m_hoverExit, "menu-exit-hover", "OSU_HOVER_EXIT_SND", true, true, false);
 
-    checkLoadSound(&m_clickPauseBack, "pause-back-click", "OSU_CLICK_QUIT_SONG_SND", true, true, false);
 
-    checkLoadSound(&m_hoverPauseBack, "pause-back-hover", "OSU_HOVER_QUIT_SONG_SND", true, true, false);
 
-    checkLoadSound(&m_clickPauseContinue, "pause-continue-click", "OSU_CLICK_RESUME_SONG_SND", true, true, false);
 
-    checkLoadSound(&m_hoverPauseContinue, "pause-continue-hover", "OSU_HOVER_RESUME_SONG_SND", true, true, false);
 
-    checkLoadSound(&m_clickPauseRetry, "pause-retry-click", "OSU_CLICK_RETRY_SONG_SND", true, true, false);
 
-    checkLoadSound(&m_hoverPauseRetry, "pause-retry-hover", "OSU_HOVER_RETRY_SONG_SND", true, true, false);
 
+    checkLoadSound(&m_typing2, "key-press-2", "OSU_TYPING_2_SND", true, true, false, false);
 
+    checkLoadSound(&m_typing3, "key-press-3", "OSU_TYPING_3_SND", true, true, false, false);
 
+    checkLoadSound(&m_typing4, "key-press-4", "OSU_TYPING_4_SND", true, true, false, false);
 
+    checkLoadSound(&m_menuBack, "menuback", "OSU_MENU_BACK_SND", true, true, false, false);
 
+    checkLoadSound(&m_closeChatTab, "click-close", "OSU_CLOSE_CHAT_TAB_SND", true, true, false, false);
 
+    checkLoadSound(&m_clickButton, "click-short-confirm", "OSU_CLICK_BUTTON_SND", true, true, false, false);
 
+    checkLoadSound(&m_hoverButton, "click-short", "OSU_HOVER_BUTTON_SND", true, true, false, false);
 
+    checkLoadSound(&m_backButtonClick, "back-button-click", "OSU_BACK_BUTTON_CLICK_SND", true, true, false, false);
 
+    checkLoadSound(&m_backButtonHover, "back-button-hover", "OSU_BACK_BUTTON_HOVER_SND", true, true, false, false);
 
+    checkLoadSound(&m_clickMainMenuCube, "menu-play-click", "OSU_CLICK_MAIN_MENU_CUBE_SND", true, true, false, false);
 
+    checkLoadSound(&m_hoverMainMenuCube, "menu-play-hover", "OSU_HOVER_MAIN_MENU_CUBE_SND", true, true, false, false);
 
+    checkLoadSound(&m_clickSingleplayer, "menu-freeplay-click", "OSU_CLICK_SINGLEPLAYER_SND", true, true, false, false);
 
+    checkLoadSound(&m_hoverSingleplayer, "menu-freeplay-hover", "OSU_HOVER_SINGLEPLAYER_SND", true, true, false, false);
 
+    checkLoadSound(&m_clickMultiplayer, "menu-multiplayer-click", "OSU_CLICK_MULTIPLAYER_SND", true, true, false,
 
+                   false);
 
+    checkLoadSound(&m_hoverMultiplayer, "menu-multiplayer-hover", "OSU_HOVER_MULTIPLAYER_SND", true, true, false,
 
+                   false);
 
+    checkLoadSound(&m_clickOptions, "menu-options-click", "OSU_CLICK_OPTIONS_SND", true, true, false, false);
 
+    checkLoadSound(&m_hoverOptions, "menu-options-hover", "OSU_HOVER_OPTIONS_SND", true, true, false, false);
 
+    checkLoadSound(&m_clickExit, "menu-exit-click", "OSU_CLICK_EXIT_SND", true, true, false, false);
 
+    checkLoadSound(&m_hoverExit, "menu-exit-hover", "OSU_HOVER_EXIT_SND", true, true, false, false);
 
     checkLoadSound(&m_expand, "select-expand", "OSU_EXPAND_SND", true, true, false);
 
-    checkLoadSound(&m_selectDifficulty, "select-difficulty", "OSU_SELECT_DIFFICULTY_SND", true, true, false);
 
+    checkLoadSound(&m_selectDifficulty, "select-difficulty", "OSU_SELECT_DIFFICULTY_SND", true, true, false, false);
 
     checkLoadSound(&m_sliderbar, "sliderbar", "OSU_DRAG_SLIDER_SND", true, true, false);
 
     checkLoadSound(&m_matchConfirm, "match-confirm", "OSU_ALL_PLAYERS_READY_SND", true, true, false);
 
     checkLoadSound(&m_roomJoined, "match-join", "OSU_ROOM_JOINED_SND", true, true, false);
@@ -899,17 +910,44 @@ void Skin::load() {
 
     checkLoadSound(&m_roomReady, "match-ready", "OSU_ROOM_READY_SND", true, true, false);
 
     checkLoadSound(&m_matchStart, "match-start", "OSU_MATCH_START_SND", true, true, false);
 
 
 
-    // others
 
-    checkLoadSound(&m_combobreak, "combobreak", "OSU_SKIN_COMBOBREAK_SND", true, true);
 
-    checkLoadSound(&m_failsound, "failsound", "OSU_SKIN_FAILSOUND_SND");
 
-    checkLoadSound(&m_applause, "applause", "OSU_SKIN_APPLAUSE_SND");
 
-    checkLoadSound(&m_menuHit, "menuhit", "OSU_SKIN_MENUHIT_SND", true, true);
 
-    checkLoadSound(&m_menuClick, "menuclick", "OSU_SKIN_MENUCLICK_SND", true, true);
 
-    checkLoadSound(&m_checkOn, "check-on", "OSU_SKIN_CHECKON_SND", true, true);
 
-    checkLoadSound(&m_checkOff, "check-off", "OSU_SKIN_CHECKOFF_SND", true, true);
 
-    checkLoadSound(&m_shutter, "shutter", "OSU_SKIN_SHUTTER_SND", true, true);
 
-    checkLoadSound(&m_sectionPassSound, "sectionpass", "OSU_SKIN_SECTIONPASS_SND");
 
-    checkLoadSound(&m_sectionFailSound, "sectionfail", "OSU_SKIN_SECTIONFAIL_SND");
 
+    checkLoadSound(&m_pauseLoop, "pause-loop", "OSU_PAUSE_LOOP_SND", false, false, true, true);
 
+    checkLoadSound(&m_pauseHover, "pause-hover", "OSU_PAUSE_HOVER_SND", true, true, false, false);
 
+    checkLoadSound(&m_clickPauseBack, "pause-back-click", "OSU_CLICK_QUIT_SONG_SND", true, true, false, false);
 
+    checkLoadSound(&m_hoverPauseBack, "pause-back-hover", "OSU_HOVER_QUIT_SONG_SND", true, true, false, false);
 
+    checkLoadSound(&m_clickPauseContinue, "pause-continue-click", "OSU_CLICK_RESUME_SONG_SND", true, true, false,
 
+                   false);
 
+    checkLoadSound(&m_hoverPauseContinue, "pause-continue-hover", "OSU_HOVER_RESUME_SONG_SND", true, true, false,
 
+                   false);
 
+    checkLoadSound(&m_clickPauseRetry, "pause-retry-click", "OSU_CLICK_RETRY_SONG_SND", true, true, false, false);
 
+    checkLoadSound(&m_hoverPauseRetry, "pause-retry-hover", "OSU_HOVER_RETRY_SONG_SND", true, true, false, false);
 
+
 
+    if(m_clickButton == NULL) m_clickButton = m_menuHit;
 
+    if(m_hoverButton == NULL) m_hoverButton = m_menuHover;
 
+    if(m_pauseHover == NULL) m_pauseHover = m_hoverButton;
 
+    if(m_selectDifficulty == NULL) m_selectDifficulty = m_clickButton;
 
+    if(m_typing2 == NULL) m_typing2 = m_typing1;
 
+    if(m_typing3 == NULL) m_typing3 = m_typing2;
 
+    if(m_typing4 == NULL) m_typing4 = m_typing3;
 
+    if(m_backButtonClick == NULL) m_backButtonClick = m_clickButton;
 
+    if(m_backButtonHover == NULL) m_backButtonHover = m_hoverButton;
 
+    if(m_menuBack == NULL) m_menuBack = m_clickButton;
 
+    if(m_closeChatTab == NULL) m_closeChatTab = m_clickButton;
 
+    if(m_clickMainMenuCube == NULL) m_clickMainMenuCube = m_clickButton;
 
+    if(m_hoverMainMenuCube == NULL) m_hoverMainMenuCube = m_menuHover;
 
+    if(m_clickSingleplayer == NULL) m_clickSingleplayer = m_clickButton;
 
+    if(m_hoverSingleplayer == NULL) m_hoverSingleplayer = m_menuHover;
 
+    if(m_clickMultiplayer == NULL) m_clickMultiplayer = m_clickButton;
 
+    if(m_hoverMultiplayer == NULL) m_hoverMultiplayer = m_menuHover;
 
+    if(m_clickOptions == NULL) m_clickOptions = m_clickButton;
 
+    if(m_hoverOptions == NULL) m_hoverOptions = m_menuHover;
 
+    if(m_clickExit == NULL) m_clickExit = m_clickButton;
 
+    if(m_hoverExit == NULL) m_hoverExit = m_menuHover;
 
+    if(m_clickPauseBack == NULL) m_clickPauseBack = m_clickButton;
 
+    if(m_hoverPauseBack == NULL) m_hoverPauseBack = m_pauseHover;
 
+    if(m_clickPauseContinue == NULL) m_clickPauseContinue = m_clickButton;
 
+    if(m_hoverPauseContinue == NULL) m_hoverPauseContinue = m_pauseHover;
 
+    if(m_clickPauseRetry == NULL) m_clickPauseRetry = m_clickButton;
 
+    if(m_hoverPauseRetry == NULL) m_hoverPauseRetry = m_pauseHover;
 
 
 
     // scaling
 
     // HACKHACK: this is pure cancer
@@ -1460,7 +1498,8 @@ void Skin::checkLoadImage(Image **addressOfPointer, std::string skinElementName,
 
 }
 
 
 
 void Skin::checkLoadSound(Sound **addressOfPointer, std::string skinElementName, std::string resourceName,
 
-                          bool isOverlayable, bool isSample, bool loop, float hardcodedVolumeMultiplier) {
 
+                          bool isOverlayable, bool isSample, bool loop, bool fallback_to_default,
 
+                          float hardcodedVolumeMultiplier) {
 
     if(*addressOfPointer != NULL) return;  // we are already loaded
 
 
 
     // NOTE: only the default skin is loaded with a resource name (it must never be unloaded by other instances), and it
@@ -1469,11 +1508,15 @@ void Skin::checkLoadSound(Sound **addressOfPointer, std::string skinElementName,
 
     // random skin support
 
     randomizeFilePath();
 
 
 
-    auto try_load_sound = [=](std::string base_path, std::string resource_name, bool loop) {
 
+    auto try_load_sound = [=](std::string base_path, std::string filename, std::string resource_name, bool loop) {
 
         const char *extensions[] = {".wav", ".mp3", ".ogg"};
 
         for(int i = 0; i < 3; i++) {
 
+            std::string fn = filename;
 
+            fn.append(extensions[i]);
 
+            fn = fix_filename_casing(base_path, fn);
 
+
 
             std::string path = base_path;
 
-            path.append(extensions[i]);
 
+            path.append(fn);
 
 
 
             if(env->fileExists(path)) {
 
                 if(osu_skin_async.getBool()) {
@@ -1487,19 +1530,18 @@ void Skin::checkLoadSound(Sound **addressOfPointer, std::string skinElementName,
 
     };
 
 
 
     // load default skin
 
-    std::string defaultpath = MCENGINE_DATA_DIR "./materials/";
 
-    defaultpath.append(OSUSKIN_DEFAULT_SKIN_PATH);
 
-    defaultpath.append(skinElementName);
 
-    std::string defaultResourceName = resourceName;
 
-    defaultResourceName.append("_DEFAULT");
 
-    *addressOfPointer = try_load_sound(defaultpath, defaultResourceName, loop);
 
+    if(fallback_to_default) {
 
+        std::string defaultpath = MCENGINE_DATA_DIR "./materials/";
 
+        defaultpath.append(OSUSKIN_DEFAULT_SKIN_PATH);
 
+        std::string defaultResourceName = resourceName;
 
+        defaultResourceName.append("_DEFAULT");
 
+        *addressOfPointer = try_load_sound(defaultpath, skinElementName, defaultResourceName, loop);
 
+    }
 
 
 
     // load user skin
 
     Sound *skin_sound = NULL;
 
     if(osu_skin_use_skin_hitsounds.getBool() || !isSample) {
 
-        std::string filepath = m_sFilePath;
 
-        filepath.append(skinElementName);
 
-        skin_sound = try_load_sound(filepath, "", loop);
 
+        skin_sound = try_load_sound(m_sFilePath, skinElementName, "", loop);
 
         if(skin_sound != NULL) {
 
             *addressOfPointer = skin_sound;
 
         }
--- a/src/App/Osu/Skin.h
+++ b/src/App/Osu/Skin.h
@@ -243,7 +243,7 @@ class Skin {
 
     inline Sound *getFailsound() { return m_failsound; }
 
     inline Sound *getApplause() { return m_applause; }
 
     inline Sound *getMenuHit() { return m_menuHit; }
 
-    inline Sound *getMenuClick() { return m_menuClick; }
 
+    inline Sound *getMenuHover() { return m_menuHover; }
 
     inline Sound *getCheckOn() { return m_checkOn; }
 
     inline Sound *getCheckOff() { return m_checkOff; }
 
     inline Sound *getShutter() { return m_shutter; }
@@ -350,7 +350,7 @@ class Skin {
 
 
 
     void checkLoadSound(Sound **addressOfPointer, std::string skinElementName, std::string resourceName,
 
                         bool isOverlayable = false, bool isSample = false, bool loop = false,
 
-                        float hardcodedVolumeMultiplier = -1.0f);
 
+                        bool fallback_to_default = true, float hardcodedVolumeMultiplier = -1.0f);
 
 
 
     void onEffectVolumeChange(UString oldValue, UString newValue);
 
     void onIgnoreBeatmapSampleVolumeChange(UString oldValue, UString newValue);
@@ -624,6 +624,8 @@ class Skin {
 
     Sound *m_hoverExit = NULL;
 
 
 
     // Pause menu sounds
 
+    Sound *m_pauseLoop = NULL;
 
+    Sound *m_pauseHover = NULL;
 
     Sound *m_clickPauseBack = NULL;
 
     Sound *m_hoverPauseBack = NULL;
 
     Sound *m_clickPauseContinue = NULL;
@@ -656,7 +658,7 @@ class Skin {
 
     Sound *m_failsound;
 
     Sound *m_applause;
 
     Sound *m_menuHit;
 
-    Sound *m_menuClick;
 
+    Sound *m_menuHover;
 
     Sound *m_checkOn;
 
     Sound *m_checkOff;
 
     Sound *m_shutter;
--- a/src/App/Osu/SongBrowser/Button.cpp
+++ b/src/App/Osu/SongBrowser/Button.cpp
@@ -249,7 +249,7 @@ void Button::deselect() { m_bSelected = false; }
 
 void Button::resetAnimations() { setMoveAwayState(MOVE_AWAY_STATE::MOVE_CENTER, false); }
 
 
 
 void Button::onClicked() {
 
-    engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+    engine->getSound()->play(osu->getSkin()->m_selectDifficulty);
 
 
 
     CBaseUIButton::onClicked();
 
 
@@ -262,7 +262,7 @@ void Button::onMouseInside() {
 
     // hover sound
 
     if(engine->getTime() > lastHoverSoundTime + 0.05f)  // to avoid earraep
 
     {
 
-        if(engine->hasFocus()) engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+        if(engine->hasFocus()) engine->getSound()->play(osu->getSkin()->getMenuHover());
 
 
 
         lastHoverSoundTime = engine->getTime();
 
     }
--- a/src/App/Osu/SongBrowser/SongBrowser.cpp
+++ b/src/App/Osu/SongBrowser/SongBrowser.cpp
@@ -2482,7 +2482,7 @@ void SongBrowser::updateLayout() {
 
 }
 
 
 
 void SongBrowser::onBack() {
 
-    engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+    engine->getSound()->play(osu->getSkin()->m_menuBack);
 
     osu->toggleSongBrowser();
 
 }
 
 
@@ -3481,8 +3481,6 @@ void SongBrowser::onAfterSortingOrGroupChangeUpdateInt(bool autoScroll) {
 
 }
 
 
 
 void SongBrowser::onSelectionMode() {
 
-    engine->getSound()->play(osu->getSkin()->getMenuClick());
 
-
 
     m_contextMenu->setPos(m_bottombarNavButtons[0]->getPos());
 
     m_contextMenu->setRelPos(m_bottombarNavButtons[0]->getRelPos());
 
     m_contextMenu->begin(0, true);
@@ -3516,12 +3514,12 @@ void SongBrowser::onSelectionMode() {
 
 }
 
 
 
 void SongBrowser::onSelectionMods() {
 
-    engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+    engine->getSound()->play(osu->getSkin()->m_expand);
 
     osu->toggleModSelection(m_bF1Pressed);
 
 }
 
 
 
 void SongBrowser::onSelectionRandom() {
 
-    engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+    engine->getSound()->play(osu->getSkin()->m_clickButton);
 
     if(m_bShiftPressed)
 
         m_bPreviousRandomBeatmapScheduled = true;
 
     else
@@ -3529,7 +3527,7 @@ void SongBrowser::onSelectionRandom() {
 
 }
 
 
 
 void SongBrowser::onSelectionOptions() {
 
-    engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+    engine->getSound()->play(osu->getSkin()->m_clickButton);
 
 
 
     Button *currentlySelectedSongButton = findCurrentlySelectedSongButton();
 
     if(currentlySelectedSongButton != NULL) {
--- a/src/App/Osu/UIButton.cpp
+++ b/src/App/Osu/UIButton.cpp
@@ -10,6 +10,8 @@
 
 
 
 using namespace std;
 
 
 
+static float button_sound_cooldown = 0.f;
 
+
 
 UIButton::UIButton(float xPos, float yPos, float xSize, float ySize, UString name, UString text)
 
     : CBaseUIButton(xPos, yPos, xSize, ySize, name, text) {
 
     m_bDefaultSkin = false;
@@ -91,7 +93,10 @@ void UIButton::mouse_update(bool *propagate_clicks) {
 
 void UIButton::onMouseInside() {
 
     m_fBrightness = 1.0f;
 
 
 
-    engine->getSound()->play(osu->getSkin()->m_hoverButton);
 
+    if(button_sound_cooldown + 0.05f < engine->getTime()) {
 
+        engine->getSound()->play(osu->getSkin()->m_hoverButton);
 
+        button_sound_cooldown = engine->getTime();
 
+    }
 
 }
 
 
 
 void UIButton::onMouseOutside() { m_fBrightness = 0.85f; }
--- a/src/App/Osu/UIContextMenu.cpp
+++ b/src/App/Osu/UIContextMenu.cpp
@@ -12,6 +12,8 @@
 
 #include "SoundEngine.h"
 
 #include "TooltipOverlay.h"
 
 
 
+static float button_sound_cooldown = 0.f;
 
+
 
 UIContextMenuButton::UIContextMenuButton(float xPos, float yPos, float xSize, float ySize, UString name, UString text,
 
                                          int id)
 
     : CBaseUIButton(xPos, yPos, xSize, ySize, name, text) {
@@ -33,7 +35,12 @@ void UIContextMenuButton::mouse_update(bool *propagate_clicks) {
 
     }
 
 }
 
 
 
-void UIContextMenuButton::onMouseInside() { engine->getSound()->play(osu->getSkin()->m_hoverButton); }
 
+void UIContextMenuButton::onMouseInside() {
 
+    if(button_sound_cooldown + 0.05f < engine->getTime()) {
 
+        engine->getSound()->play(osu->getSkin()->m_hoverButton);
 
+        button_sound_cooldown = engine->getTime();
 
+    }
 
+}
 
 
 
 void UIContextMenuButton::onMouseDownInside() { engine->getSound()->play(osu->getSkin()->m_clickButton); }
 
 
--- a/src/App/Osu/UIPauseMenuButton.cpp
+++ b/src/App/Osu/UIPauseMenuButton.cpp
@@ -49,7 +49,7 @@ void UIPauseMenuButton::setBaseScale(float xScale, float yScale) {
 
 void UIPauseMenuButton::onMouseInside() {
 
     CBaseUIButton::onMouseInside();
 
 
 
-    if(engine->hasFocus()) engine->getSound()->play(osu->getSkin()->getMenuClick());
 
+    if(engine->hasFocus()) engine->getSound()->play(osu->getSkin()->getMenuHover());
 
 
 
     const float animationDuration = 0.09f;
 
     anim->moveLinear(&m_vScale.x, m_vBaseScale.x * m_fScaleMultiplier, animationDuration, true);
--- a/src/Engine/Platform/LinuxEnvironment.cpp
+++ b/src/Engine/Platform/LinuxEnvironment.cpp
@@ -875,3 +875,21 @@ UString LinuxEnvironment::getClipboardTextInt() {
 
 }
 
 
 
 #endif
 
+
 
+#include <filesystem>
 
+
 
+std::string fix_filename_casing(std::string directory, std::string filename) {
 
+#ifdef _WIN32
 
+    return filename;
 
+#else
 
+    if(!std::filesystem::exists(directory) || !std::filesystem::is_directory(directory)) return filename;
 
+
 
+    std::filesystem::path dir = directory;
 
+    for(auto &entry : std::filesystem::directory_iterator(dir)) {
 
+        if(entry.is_regular_file() && !strcasecmp(entry.path().filename().string().c_str(), filename.c_str())) {
 
+            return entry.path().filename().string();
 
+        }
 
+    }
 
+    return filename;
 
+#endif
 
+}
--- a/src/Engine/Platform/LinuxEnvironment.h
+++ b/src/Engine/Platform/LinuxEnvironment.h
@@ -1,15 +1,7 @@
 
-//================ Copyright (c) 2015, PG, All rights reserved. =================//
 
-//
 
-// Purpose:		linux
 
-//
 
-// $NoKeywords: $linuxenv
 
-//===============================================================================//
 
+#pragma once
 
 
 
 #ifdef __linux__
 
 
 
-#ifndef LINUXENVIRONMENT_H
 
-#define LINUXENVIRONMENT_H
 
-
 
 #include <X11/X.h>
 
 #include <X11/Xlib.h>
 
 
@@ -167,4 +159,4 @@ class LinuxEnvironment : public Environment {
 
 
 
 #endif
 
 
 
-#endif
 
+std::string fix_filename_casing(std::string directory, std::string filename);
--- a/src/GUI/CBaseUISlider.cpp
+++ b/src/GUI/CBaseUISlider.cpp
@@ -221,7 +221,7 @@ CBaseUISlider *CBaseUISlider::setValue(float value, bool animate, bool call_call
 
 
 
         if(m_bHasChanged) {
 
             if(m_fLastSoundPlayTime + 0.05f < engine->getTime()) {
 
-                engine->getSound()->play(osu->getSkin()->m_sliderbar);
 
+                engine->getSound()->play(osu->getSkin()->m_sliderbar, 0.f, 1.f + 0.05f * percent);
 
                 m_fLastSoundPlayTime = engine->getTime();
 
             }
 
         }