Fix chart sample loading

Main/Application.cpp

@@ -762,7 +762,11 @@ Sample Application::LoadSample(const String& name, const bool& external)
     if(external)
 	    path = name;
     else
-        path = String("skins/") + m_skin + String("/audio/") + name + ".wav";
+        path = String("skins/") + m_skin + String("/audio/") + name;
+
+	String ext = Path::GetExtension(path);
+	if (ext.empty())
+		path += ".wav";
 
 	Sample ret = g_audio->CreateSample(Path::Normalize(path));
 	assert(ret);

Main/Game.cpp

@@ -869,19 +869,25 @@ class Game_Impl : public Game
 		CheckedLoad(m_clickSamples[0] = g_application->LoadSample("click-01"));
 		CheckedLoad(m_clickSamples[1] = g_application->LoadSample("click-02"));
 
+		Vector<String> default_sfx = {
+			"clap",
+			"clap_impact",
+			"clap_punchy",
+			"snare",
+			"snare_lo",
+		};
+
 		auto samples = m_beatmap->GetSamplePaths();
 		m_fxSamples = new Sample[samples.size()];
 		for (int i = 0; i < samples.size(); i++)
 		{
-			String ext = samples[i].substr(samples[i].length() - 4, 4);
-			ext.ToUpper();
-			if (ext == ".WAV")
+			if (default_sfx.Contains(samples[i]))
 			{
-				CheckedLoad(m_fxSamples[i] = g_application->LoadSample(m_mapRootPath + "/" + samples[i], true));
+				CheckedLoad(m_fxSamples[i] = g_application->LoadSample(samples[i]));
 			}
 			else
 			{
-				CheckedLoad(m_fxSamples[i] = g_application->LoadSample(samples[i]));
+				CheckedLoad(m_fxSamples[i] = g_application->LoadSample(m_mapRootPath + "/" + samples[i], true));
 			}
 
 		}