diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2019-10-27 18:04:13 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2019-10-27 18:04:13 +0100 |
| commit | cce3aac4c3ea654f943b8b4b9cb81a733ad2a87b (patch) | |
| tree | 7f5c4b84f94a53a8f630c44a58c1cab8cab141c1 /src/audio/AudioManager.h | |
| parent | Merge pull request #261 from erorcun/erorcun (diff) | |
| download | re3-cce3aac4c3ea654f943b8b4b9cb81a733ad2a87b.tar re3-cce3aac4c3ea654f943b8b4b9cb81a733ad2a87b.tar.gz re3-cce3aac4c3ea654f943b8b4b9cb81a733ad2a87b.tar.bz2 re3-cce3aac4c3ea654f943b8b4b9cb81a733ad2a87b.tar.lz re3-cce3aac4c3ea654f943b8b4b9cb81a733ad2a87b.tar.xz re3-cce3aac4c3ea654f943b8b4b9cb81a733ad2a87b.tar.zst re3-cce3aac4c3ea654f943b8b4b9cb81a733ad2a87b.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/AudioManager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index ef7900e2..2a4fcb2c 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -449,7 +449,7 @@ public: float speedMultiplier) const; /// ok int32 ComputePan(float, CVector *); /// ok uint8 ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance) const; /// ok - int32 CreateEntity(int32 type, CPhysical *entity); /// ok + int32 CreateEntity(int32 type, void* entity); /// ok void DestroyAllGameCreatedEntities(); /// ok void DestroyEntity(int32 id); /// ok @@ -653,7 +653,7 @@ public: void ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface1, uint8 surface2, float collisionPower, float intensity2); /// ok void ReportCrime(int32 crime, const CVector *pos); /// ok - void ResetAudioLogicTimers(int32 timer); /// ok + void ResetAudioLogicTimers(uint32 timer); /// ok void ResetPoliceRadio(); /// ok void ResetTimers(uint32 time); /// ok @@ -666,7 +666,7 @@ public: void SetDynamicAcousticModelingStatus(bool status); void SetEffectsFadeVolume(uint8 volume) const; void SetEffectsMasterVolume(uint8 volume) const; - void SetEntityStatus(int32 id, bool status); + void SetEntityStatus(int32 id, uint8 status); uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *audioCollision); /// ok void SetMissionAudioLocation(float x, float y, float z); void SetMissionScriptPoliceAudio(int32 sfx) const; |