summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-08-29 08:42:24 +0200
committerSergeanur <s.anureev@yandex.ua>2021-08-29 08:42:24 +0200
commit55e950fe84d86dd7a5007f06c9727c97d57446b4 (patch)
tree1ceec2fa3e9085e125d9c420f812f9e49eaa5381 /src/audio/AudioManager.h
parentMerge pull request #1322 from x87/master (diff)
downloadre3-55e950fe84d86dd7a5007f06c9727c97d57446b4.tar
re3-55e950fe84d86dd7a5007f06c9727c97d57446b4.tar.gz
re3-55e950fe84d86dd7a5007f06c9727c97d57446b4.tar.bz2
re3-55e950fe84d86dd7a5007f06c9727c97d57446b4.tar.lz
re3-55e950fe84d86dd7a5007f06c9727c97d57446b4.tar.xz
re3-55e950fe84d86dd7a5007f06c9727c97d57446b4.tar.zst
re3-55e950fe84d86dd7a5007f06c9727c97d57446b4.zip
Diffstat (limited to '')
-rw-r--r--src/audio/AudioManager.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 01f7bb23..7b3526e7 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -335,7 +335,7 @@ public:
float GetDistanceSquared(const CVector &v);
void CalculateDistance(bool8 &condition, float dist);
void ProcessSpecial();
- void ProcessEntity(int32 sound);
+ void ProcessEntity(int32 id);
void ProcessPhysical(int32 id);
// vehicles
@@ -355,7 +355,7 @@ public:
bool8 ProcessVehicleSkidding(cVehicleParams &params);
float GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);
float GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange); // inlined on PS2
- void ProcessVehicleHorn(cVehicleParams &params);
+ bool8 ProcessVehicleHorn(cVehicleParams &params);
bool8 UsesSiren(uint32 model); // inlined on PS2
bool8 UsesSirenSwitching(uint32 model); // inlined on PS2
bool8 ProcessVehicleSirenOrAlarm(cVehicleParams &params);
@@ -473,9 +473,9 @@ public:
uint32 GetGenericFemaleTalkSfx(uint16 sound);
// particles
- void ProcessExplosions(int32 explosion);
- void ProcessFires(int32 entity);
- void ProcessWaterCannon(int32);
+ void ProcessExplosions(int32 id);
+ void ProcessFires(int32 id);
+ void ProcessWaterCannon(int32 id);
// script objects
void ProcessScriptObject(int32 id); // inlined on PS2
@@ -576,3 +576,10 @@ static_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");
#endif
extern cAudioManager AudioManager;
+
+enum
+{
+ PED_COMMENT_VOLUME = 127,
+ PED_COMMENT_VOLUME_BEHIND_WALL = 31,
+ COLLISION_MAX_DIST = 60,
+};