TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-18 22:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

standardize soundasset preloading for datablocks

Browse source
This commit is contained in:
AzaezelX 2023-02-19 05:19:51 -06:00
parent 6c8dfdbe4c
commit 15f7f04bee
13 changed files with 46 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/T3D/fx/lightning.cpp
View file

@ -297,19 +297,17 @@ bool LightningData::preload(bool server, String &errorStr)
{
for (S32 i = 0; i < MaxThunders; i++)
{
_setThunderSound(getThunderSound(i), i);
if (isThunderSoundValid(i) && !getThunderSoundProfile(i))
if (getThunderSound(i) != StringTable->EmptyString() && !isThunderSoundValid(i))
{
Con::errorf(ConsoleLogEntry::General, "LightningData::preload: Cant get an sfxProfile for thunder.");
Con::errorf(ConsoleLogEntry::General, "LightningData::preload: Invalid ThunderSound asset.");
return false;
}
}
_setStrikeSound(getStrikeSound());
if (isStrikeSoundValid() && !getStrikeSoundProfile())
if (getStrikeSound() != StringTable->EmptyString() && !isStrikeSoundValid())
{
Con::errorf(ConsoleLogEntry::General, "LightningData::preload: can't get sfxProfile from strike sound.");
Con::errorf(ConsoleLogEntry::General, "LightningData::preload: Invalid StrikeSound asset.");
return false;
}
mNumStrikeTextures = 0;