From 0c6ca6c701152819743ade1f122682b79e470924 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Wed, 29 Sep 2021 12:38:47 -0500 Subject: [PATCH] conflict resolution --- Engine/source/T3D/fx/lightning.cpp | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/Engine/source/T3D/fx/lightning.cpp b/Engine/source/T3D/fx/lightning.cpp index dc92c1647..0e28b1a42 100644 --- a/Engine/source/T3D/fx/lightning.cpp +++ b/Engine/source/T3D/fx/lightning.cpp @@ -296,34 +296,20 @@ 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); + if (isThunderSoundValid(i) && !getThunderSoundProfile(i)) { - _setThunderSound(getThunderSound(i), i); - Con::printf("Thunder sound: %d %s", i, getThunderSound(i)); - - if (!getThunderSoundProfile(i)) Con::errorf(ConsoleLogEntry::General, "LightningData::preload: Cant get an sfxProfile for thunder."); } } -<<<<<<< HEAD - if (getStrikeSound() != StringTable->EmptyString()) + _setStrikeSound(getStrikeSound()); + if (isStrikeSoundValid() && !getStrikeSoundProfile()) { - _setStrikeSound(getStrikeSound()); - - 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++)