TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-01 19:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'SoundAssetImplements' of https://github.com/Azaezel/Torque3D-1 into SoundAssetImplements

Browse source 
# Conflicts:
#	Engine/source/T3D/fx/lightning.cpp
This commit is contained in:
marauder2k7 2021-09-29 06:31:56 +01:00
commit 3d7f092c52
5 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -296,7 +296,11 @@ bool LightningData::preload(bool server, String &errorStr)
{
for (S32 i = 0; i < MaxThunders; i++)
{
<<<<<<< HEAD
if (getThunderSound(i) != StringTable->EmptyString())
=======
if (isThunderSoundValid(i))
>>>>>>> 2630b4ada6a97222ad1e200fa962cf426b7d4161
{
_setThunderSound(getThunderSound(i), i);
Con::printf("Thunder sound: %d %s", i, getThunderSound(i));
@ -308,6 +312,7 @@ bool LightningData::preload(bool server, String &errorStr)
}
<<<<<<< HEAD
if (getStrikeSound() != StringTable->EmptyString())
{
_setStrikeSound(getStrikeSound());
@ -315,6 +320,10 @@ bool LightningData::preload(bool server, String &errorStr)
if(!getStrikeSoundProfile())
Con::errorf(ConsoleLogEntry::General, "LightningData::preload: can't get sfxProfile from strike sound.");
}
=======
if(isStrikeSoundValid() && !getStrikeSoundProfile())
Con::errorf(ConsoleLogEntry::General, "LightningData::preload: can't get sfxProfile from asset");
>>>>>>> 2630b4ada6a97222ad1e200fa962cf426b7d4161
mNumStrikeTextures = 0;
for (U32 k = 0; k < MaxTextures; k++)