summaryrefslogtreecommitdiffstats
path: root/src/objects/Object.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-16 04:06:51 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-16 04:06:51 +0200
commitec1b91e5270b1c91885a5e8000a5ff8286aee140 (patch)
tree1ff508fda73ba0a3bc5514ab803fc3cd9e25f4b7 /src/objects/Object.cpp
parentfixed hanging boot (diff)
downloadre3-ec1b91e5270b1c91885a5e8000a5ff8286aee140.tar
re3-ec1b91e5270b1c91885a5e8000a5ff8286aee140.tar.gz
re3-ec1b91e5270b1c91885a5e8000a5ff8286aee140.tar.bz2
re3-ec1b91e5270b1c91885a5e8000a5ff8286aee140.tar.lz
re3-ec1b91e5270b1c91885a5e8000a5ff8286aee140.tar.xz
re3-ec1b91e5270b1c91885a5e8000a5ff8286aee140.tar.zst
re3-ec1b91e5270b1c91885a5e8000a5ff8286aee140.zip
Diffstat (limited to '')
-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 cd2cd688..c5f73987 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;
@@ -219,7 +220,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: {
@@ -242,7 +243,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: {
@@ -267,7 +268,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: {
@@ -292,7 +293,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;
}
}