summaryrefslogtreecommitdiffstats
path: root/src/objects/Object.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-16 04:07:39 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-16 04:07:39 +0200
commit76dd769085ae822243b4c34aa867408ae69e5893 (patch)
tree525c9b05b9b320e210cbb447abe33d3c33e69dbc /src/objects/Object.cpp
parentMerge pull request #550 from erorcun/miami (diff)
parentRemove unused audio enum (diff)
downloadre3-76dd769085ae822243b4c34aa867408ae69e5893.tar
re3-76dd769085ae822243b4c34aa867408ae69e5893.tar.gz
re3-76dd769085ae822243b4c34aa867408ae69e5893.tar.bz2
re3-76dd769085ae822243b4c34aa867408ae69e5893.tar.lz
re3-76dd769085ae822243b4c34aa867408ae69e5893.tar.xz
re3-76dd769085ae822243b4c34aa867408ae69e5893.tar.zst
re3-76dd769085ae822243b4c34aa867408ae69e5893.zip
Diffstat (limited to 'src/objects/Object.cpp')
-rw-r--r--src/objects/Object.cpp9
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;
}
}