eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Code Issues 121 Wiki Activity

sound crash fix

Browse Source
This commit is contained in:
milek7
2017-10-12 21:57:15 +02:00
parent 730280a2e2
commit c5716a2158
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound.cpp
View File

@@ -71,7 +71,10 @@ sound_manager::~sound_manager()
sound_buffer* sound_manager::find_buffer(std::string name) sound_buffer* sound_manager::find_buffer(std::string name)
{ {
name.erase(name.rfind('.')); size_t pos = name.rfind('.');
if (pos != name.npos)
name.erase(pos);
std::replace(name.begin(), name.end(), '\\', '/'); std::replace(name.begin(), name.end(), '\\', '/');
auto search = buffers.find(name); auto search = buffers.find(name);
@@ -86,7 +89,10 @@ std::string sound_manager::find_file(std::string name)
if (FileExists(name)) if (FileExists(name))
return name; return name;
name.erase(name.rfind('.')); size_t pos = name.rfind('.');
if (pos != name.npos)
name.erase(pos);
std::vector<std::string> exts { ".wav", ".WAV", ".flac", ".ogg" }; std::vector<std::string> exts { ".wav", ".WAV", ".flac", ".ogg" };
for (auto const &ext : exts) for (auto const &ext : exts)
if (FileExists(name + ext)) if (FileExists(name + ext))
@@ -118,7 +124,9 @@ sound_buffer* sound_manager::get_buffer(std::string const &name)
buf = new sound_buffer(file); buf = new sound_buffer(file);
file.erase(file.rfind('.')); size_t pos = file.rfind('.');
if (pos != file.npos)
file.erase(pos);
buffers.emplace(file, buf); buffers.emplace(file, buf);
return buf; return buf;