Skip to content

Commit 0820cff

Browse files
authored
Merge pull request #1705 from Azaezel/alpha41/soundsQuickfix
quick fix for misc sounds
2 parents 4fe0dd0 + 9ca436d commit 0820cff

5 files changed

Lines changed: 6 additions & 0 deletions

File tree

Engine/source/T3D/player.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@ bool PlayerData::preload(bool server, String &errorStr)
471471
if (!server) {
472472
for (U32 i = 0; i < MaxSounds; ++i)
473473
{
474+
_setPlayerSound(getPlayerSound(i), i);
474475
if (!isPlayerSoundValid(i))
475476
{
476477
//return false; -TODO: trigger asset download

Engine/source/T3D/rigidShape.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ bool RigidShapeData::preload(bool server, String &errorStr)
348348
if (!server) {
349349
for (S32 i = 0; i < Body::MaxSounds; i++)
350350
{
351+
_setBodySounds(getBodySounds(i), i);
351352
if (!isBodySoundsValid(i))
352353
{
353354
//return false; -TODO: trigger asset download
@@ -356,6 +357,7 @@ bool RigidShapeData::preload(bool server, String &errorStr)
356357

357358
for (S32 j = 0; j < Sounds::MaxSounds; j++)
358359
{
360+
_setWaterSounds(getWaterSounds(j), j);
359361
if (!isWaterSoundsValid(j))
360362
{
361363
//return false; -TODO: trigger asset download

Engine/source/T3D/vehicles/flyingVehicle.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ bool FlyingVehicleData::preload(bool server, String &errorStr)
141141
if (!server) {
142142
for (S32 i = 0; i < MaxSounds; i++)
143143
{
144+
_setFlyingSounds(getFlyingSounds(i), i);
144145
if (!isFlyingSoundsValid(i))
145146
{
146147
//return false; -TODO: trigger asset download

Engine/source/T3D/vehicles/hoverVehicle.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ bool HoverVehicleData::preload(bool server, String &errorStr)
313313

314314
for (S32 i = 0; i < MaxSounds; i++)
315315
{
316+
_setHoverSounds(getHoverSounds(i), i);
316317
if (!isHoverSoundsValid(i))
317318
{
318319
//return false; -TODO: trigger asset download

Engine/source/T3D/vehicles/wheeledVehicle.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ bool WheeledVehicleData::preload(bool server, String &errorStr)
348348
if (!server) {
349349
for (S32 i = 0; i < MaxSounds; i++)
350350
{
351+
_setWheeledVehicleSounds(getWheeledVehicleSounds(i), i);
351352
if (!isWheeledVehicleSoundsValid(i))
352353
{
353354
//return false; -TODO: trigger asset download

0 commit comments

Comments
 (0)