Preload all soundAsset

-Fixed: Preloads need to preload all soundAssets not just the ones it was preloading before.
This commit is contained in:
marauder2k7 2021-09-20 17:05:11 +01:00
parent 30b57c0f95
commit e9d0f68b55
5 changed files with 37 additions and 14 deletions

View file

@ -289,18 +289,18 @@ bool LightningData::preload(bool server, String &errorStr)
//dQsort(thunderSounds, MaxThunders, sizeof(SFXTrack*), cmpSounds); //dQsort(thunderSounds, MaxThunders, sizeof(SFXTrack*), cmpSounds);
for (S32 i = 0; i < MaxThunders; i++) {
if (mThunderSound[i])
{
_setThunderSound(getThunderSound(i), i);
}
}
if (server == false) if (server == false)
{ {
String sfxErrorStr; for (S32 i = 0; i < MaxThunders; i++) {
for (U32 i = 0; i < MaxThunders; i++) { if (mThunderSound[i])
if (!getThunderProfile(i)) {
_setThunderSound(getThunderSound(i), i);
}
}
for (U32 j = 0; j < MaxThunders; j++) {
if (!getThunderProfile(j))
Con::errorf(ConsoleLogEntry::General, "LightningData::preload: Cant get an sfxProfile for thunder."); Con::errorf(ConsoleLogEntry::General, "LightningData::preload: Cant get an sfxProfile for thunder.");
} }
@ -308,11 +308,11 @@ bool LightningData::preload(bool server, String &errorStr)
Con::errorf(ConsoleLogEntry::General, "LightningData::preload: can't get sfxProfile from asset"); Con::errorf(ConsoleLogEntry::General, "LightningData::preload: can't get sfxProfile from asset");
mNumStrikeTextures = 0; mNumStrikeTextures = 0;
for (U32 i = 0; i < MaxTextures; i++) for (U32 k = 0; k < MaxTextures; k++)
{ {
if (strikeTextureNames[i][0]) if (strikeTextureNames[k][0])
{ {
strikeTextures[i] = GFXTexHandle(strikeTextureNames[i], &GFXStaticTextureProfile, avar("%s() - strikeTextures[%d] (line %d)", __FUNCTION__, i, __LINE__)); strikeTextures[k] = GFXTexHandle(strikeTextureNames[i], &GFXStaticTextureProfile, avar("%s() - strikeTextures[%d] (line %d)", __FUNCTION__, k, __LINE__));
mNumStrikeTextures++; mNumStrikeTextures++;
} }
} }

View file

@ -300,10 +300,21 @@ bool RigidShapeData::preload(bool server, String &errorStr)
// Resolve objects transmitted from server // Resolve objects transmitted from server
if (!server) { if (!server) {
for (S32 i = 0; i < Body::MaxSounds; i++) for (S32 i = 0; i < Body::MaxSounds; i++)
{
if (mBodySounds[i]) if (mBodySounds[i])
{ {
_setBodySounds(getBodySounds(i), i); _setBodySounds(getBodySounds(i), i);
} }
}
for (S32 j = 0; j < Sounds::MaxSounds; j++)
{
if (mWaterSounds[j])
{
_setWaterSounds(getWaterSounds(j), j);
}
}
} }
if( !dustEmitter && dustID != 0 ) if( !dustEmitter && dustID != 0 )

View file

@ -131,11 +131,12 @@ bool FlyingVehicleData::preload(bool server, String &errorStr)
// Resolve objects transmitted from server // Resolve objects transmitted from server
if (!server) { if (!server) {
for (S32 i = 0; i < MaxSounds; i++) for (S32 i = 0; i < MaxSounds; i++)
{
if (mFlyingSounds[i]) if (mFlyingSounds[i])
{ {
_setFlyingSounds(getFlyingSounds(i), i); _setFlyingSounds(getFlyingSounds(i), i);
} }
}
for (S32 j = 0; j < MaxJetEmitters; j++) for (S32 j = 0; j < MaxJetEmitters; j++)
if (jetEmitter[j]) if (jetEmitter[j])
Sim::findObject(SimObjectId((uintptr_t)jetEmitter[j]),jetEmitter[j]); Sim::findObject(SimObjectId((uintptr_t)jetEmitter[j]),jetEmitter[j]);

View file

@ -305,6 +305,7 @@ bool HoverVehicleData::preload(bool server, String &errorStr)
// Resolve objects transmitted from server // Resolve objects transmitted from server
if (!server) { if (!server) {
for (S32 i = 0; i < MaxSounds; i++) for (S32 i = 0; i < MaxSounds; i++)
if (mHoverSounds[i]) if (mHoverSounds[i])
{ {

View file

@ -218,10 +218,20 @@ bool VehicleData::preload(bool server, String &errorStr)
// Resolve objects transmitted from server // Resolve objects transmitted from server
if (!server) { if (!server) {
for (S32 i = 0; i < Body::MaxSounds; i++) for (S32 i = 0; i < Body::MaxSounds; i++)
{
if (mVehicleBodySounds[i]) if (mVehicleBodySounds[i])
{ {
_setVehicleBodySounds(getVehicleBodySounds(i), i); _setVehicleBodySounds(getVehicleBodySounds(i), i);
} }
}
for (S32 j = 0; j < Sounds::MaxSounds; j++)
{
if (mVehicleWaterSounds[j])
{
_setVehicleWaterSounds(getVehicleWaterSounds(j), j);
}
}
} }
if( !dustEmitter && dustID != 0 ) if( !dustEmitter && dustID != 0 )