TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +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

5
Engine/source/T3D/vehicles/flyingVehicle.cpp
View file

@ -141,9 +141,10 @@ bool FlyingVehicleData::preload(bool server, String &errorStr)
if (!server) {
for (S32 i = 0; i < MaxSounds; i++)
{
if (mFlyingSounds[i])
if (getFlyingSounds(i) != StringTable->EmptyString() && !isFlyingSoundsValid(i))
{
_setFlyingSounds(getFlyingSounds(i), i);
Con::errorf(ConsoleLogEntry::General, "FlyingVehicleData::preload: Invalid FlyingSounds asset.");
return false;
}
}
for (S32 j = 0; j < MaxJetEmitters; j++)

8
Engine/source/T3D/vehicles/hoverVehicle.cpp
View file

@ -314,11 +314,13 @@ bool HoverVehicleData::preload(bool server, String &errorStr)
if (!server) {
for (S32 i = 0; i < MaxSounds; i++)
if (getHoverSounds(i) != StringTable->EmptyString())
{
if (getHoverSounds(i) != StringTable->EmptyString() && !isHoverSoundsValid(i))
{
_setHoverSounds(getHoverSounds(i), i);
Con::errorf(ConsoleLogEntry::General, "HoverVehicleData::preload: Invalid HoverSounds asset.");
return false;
}
}
for (S32 j = 0; j < MaxJetEmitters; j++)
if (jetEmitter[j])
Sim::findObject(SimObjectId((uintptr_t)jetEmitter[j]),jetEmitter[j]);

5
Engine/source/T3D/vehicles/wheeledVehicle.cpp
View file

@ -348,9 +348,10 @@ bool WheeledVehicleData::preload(bool server, String &errorStr)
if (!server) {
for (S32 i = 0; i < MaxSounds; i++)
{
if (getWheeledVehicleSounds(i) != StringTable->EmptyString())
if (getWheeledVehicleSounds(i) != StringTable->EmptyString() && !isWheeledVehicleSoundsValid(i))
{
_setWheeledVehicleSounds(getWheeledVehicleSounds(i), i);
Con::errorf(ConsoleLogEntry::General, "HoverVehicleData::preload: Invalid WheeledVehicleSounds asset.");
return false;
}
}