diff options
author | Thanasis Antoniou | 2019-07-17 19:08:43 +0300 |
---|---|---|
committer | Thanasis Antoniou | 2019-07-17 19:09:15 +0300 |
commit | caa4578add35021bfbb00b5f81359592402096a3 (patch) | |
tree | 2133b0dd3f4e71324bafc1ca65699ba79483e512 /engines/bladerunner/ambient_sounds.h | |
parent | d1ff73cbb381db1876e2dbdf0457c9efc76fcd1a (diff) | |
download | scummvm-rg350-caa4578add35021bfbb00b5f81359592402096a3.tar.gz scummvm-rg350-caa4578add35021bfbb00b5f81359592402096a3.tar.bz2 scummvm-rg350-caa4578add35021bfbb00b5f81359592402096a3.zip |
BLADERUNNER: Use unsigned 32bit diff for time durations
Diffstat (limited to 'engines/bladerunner/ambient_sounds.h')
-rw-r--r-- | engines/bladerunner/ambient_sounds.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/engines/bladerunner/ambient_sounds.h b/engines/bladerunner/ambient_sounds.h index 06144d6076..73b8e7535d 100644 --- a/engines/bladerunner/ambient_sounds.h +++ b/engines/bladerunner/ambient_sounds.h @@ -42,9 +42,10 @@ class AmbientSounds { Common::String name; int32 hash; int audioPlayerTrack; - int timeMin; - int timeMax; - uint32 nextPlayTime; + uint32 timeMin; + uint32 timeMax; + uint32 nextPlayTimeStart; + uint32 nextPlayTimeDiff; int volumeMin; int volumeMax; int volume; @@ -76,7 +77,7 @@ public: void addSound( int sfxId, - int timeMin, int timeMax, + uint32 timeMin, uint32 timeMax, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, @@ -87,7 +88,7 @@ public: void addSpeech( int actorId, int sentenceId, - int timeMin, int timeMax, + uint32 timeMin, uint32 timeMax, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, @@ -95,12 +96,12 @@ public: void playSound(int sfxId, int volume, int panStart, int panEnd, int priority); void playSpeech(int actorId, int sentenceId, int volume, int panStart, int panEnd, int priority); - void addLoopingSound(int sfxId, int volume, int pan, int delay); - void adjustLoopingSound(int sfxId, int volume, int pan, int delay); + void addLoopingSound(int sfxId, int volume, int pan, uint32 delay); + void adjustLoopingSound(int sfxId, int volume, int pan, uint32 delay); // it seems there is little confusion in original code about delay parameter, // sometimes it is used as boolean in same way as stopPlaying from non looping - void removeLoopingSound(int sfxId, int delay); - void removeAllLoopingSounds(int delay); + void removeLoopingSound(int sfxId, uint32 delay); + void removeAllLoopingSounds(uint32 delay); void tick(); @@ -120,14 +121,14 @@ private: void addSoundByName( const Common::String &name, - int timeMin, int timeMax, + uint32 timeMin, uint32 timeMax, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk); void removeNonLoopingSoundByIndex(int index, bool stopPlaying); - void removeLoopingSoundByIndex(int index, int delay); + void removeLoopingSoundByIndex(int index, uint32 delay); }; } // End of namespace BladeRunner |