Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[ILoadedSound] small fixes

Browse Source
This commit is contained in:
TheApadayo 2017-02-13 11:24:07 -05:00
parent c8b93dfa20
commit f98562ebe0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Components/Modules/AssetInterfaces/ILoadedSound.cpp
View File

@ -29,6 +29,7 @@ namespace Assets
if (chunkIDBuffer != 0x46464952) // RIFF if (chunkIDBuffer != 0x46464952) // RIFF
{ {
Components::Logger::Error(0, "Reading sound '%s' failed, header is invalid!", name.data()); Components::Logger::Error(0, "Reading sound '%s' failed, header is invalid!", name.data());
return;
} }
unsigned int chunkSize = reader.read<unsigned int>(); unsigned int chunkSize = reader.read<unsigned int>();
@ -37,6 +38,7 @@ namespace Assets
if (format != 0x45564157) // WAVE if (format != 0x45564157) // WAVE
{ {
Components::Logger::Error(0, "Reading sound '%s' failed, header is invalid!", name.data()); Components::Logger::Error(0, "Reading sound '%s' failed, header is invalid!", name.data());
return;
} }
while (!sound->sound.data && !reader.end()) while (!sound->sound.data && !reader.end())
@ -53,6 +55,7 @@ namespace Assets
if (sound->sound.info.format != 1 && sound->sound.info.format != 17) if (sound->sound.info.format != 1 && sound->sound.info.format != 17)
{ {
Components::Logger::Error(0, "Reading sound '%s' failed, invalid format!", name.data()); Components::Logger::Error(0, "Reading sound '%s' failed, invalid format!", name.data());
return;
} }
sound->sound.info.channels = reader.read<short>(); sound->sound.info.channels = reader.read<short>();
@ -86,9 +89,10 @@ namespace Assets
if (!sound->sound.info.data_ptr) if (!sound->sound.info.data_ptr)
{ {
Components::Logger::Error(0, "Reading sound '%s' failed, invalid format!", name.data()); Components::Logger::Error(0, "Reading sound '%s' failed, invalid format!", name.data());
return;
} }
sound->name = _strdup(name.c_str()); sound->name = builder->getAllocator()->duplicateString(name.c_str());
header->loadSnd = sound; header->loadSnd = sound;
} }