diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 09:52:58 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 09:52:58 +0200 |
| commit | 5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51 (patch) | |
| tree | 361e17568ce5dd77a8711f196f92324cdef72d10 /src/objects/Object.cpp | |
| parent | remove debug (diff) | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.gz re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.bz2 re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.lz re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.xz re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.zst re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.zip | |
Diffstat (limited to 'src/objects/Object.cpp')
| -rw-r--r-- | src/objects/Object.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index a5896975..0107c75c 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -11,6 +11,7 @@ #include "ObjectData.h" #include "World.h" #include "Floater.h" +#include "soundlist.h" int16 CObject::nNoTempObjects; int16 CObject::nBodyCastHealth = 1000; @@ -220,7 +221,7 @@ CObject::ObjectDamage(float amount) int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80); CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, randomColor, nRotationSpeed, 0, currentFrame, 0); } - PlayOneShotScriptObject(_SCRSOUND_CARDBOARD_BOX_SMASH, vecPos); + PlayOneShotScriptObject(SCRIPT_SOUND_BOX_DESTROYED_2, vecPos); break; } case DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY: { @@ -243,7 +244,7 @@ CObject::ObjectDamage(float amount) int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80); CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, randomColor, nRotationSpeed, 0, currentFrame, 0); } - PlayOneShotScriptObject(_SCRSOUND_WOODEN_BOX_SMASH, vecPos); + PlayOneShotScriptObject(SCRIPT_SOUND_BOX_DESTROYED_1, vecPos); break; } case DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY: { @@ -268,7 +269,7 @@ CObject::ObjectDamage(float amount) int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80); CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, color, nRotationSpeed, 0, currentFrame, 0); } - PlayOneShotScriptObject(_SCRSOUND_TYRE_BUMP, vecPos); + PlayOneShotScriptObject(SCRIPT_SOUND_TIRE_COLLISION, vecPos); break; } case DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY: { @@ -293,7 +294,7 @@ CObject::ObjectDamage(float amount) int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80); CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, color, nRotationSpeed, 0, currentFrame, 0); } - PlayOneShotScriptObject(_SCRSOUND_COL_CAR, vecPos); + PlayOneShotScriptObject(SCRIPT_SOUND_METAL_COLLISION, vecPos); break; } } |