diff options
| author | Evgeny Grechnikov | 2018-10-14 20:05:54 +0300 |
|---|---|---|
| committer | Evgeny Grechnikov | 2018-10-14 20:08:32 +0300 |
| commit | 53cd6616c958e4a50644254688aea222177f2ae2 (patch) | |
| tree | b0373918c84cf577268056ef0fe65a97f19f7e58 /engines/lastexpress/entities/gendarmes.h | |
| parent | 46fe0aafd6996841ee9969da7a8988497baf51b6 (diff) | |
| download | scummvm-rg350-53cd6616c958e4a50644254688aea222177f2ae2.tar.gz scummvm-rg350-53cd6616c958e4a50644254688aea222177f2ae2.tar.bz2 scummvm-rg350-53cd6616c958e4a50644254688aea222177f2ae2.zip | |
LASTEXPRESS: refactor sound flags
Merge SoundFlag and SoundStatus into a single enum;
SoundEntry::setupStatus just casts one to another.
Keep only definitions of bits in SoundFlag; drop compound flags
like kFlagSteam = kSoundTypeAmbient | kSoundFlagLooped | kVolume7,
use ORed simple flags in calls; change the signature
of SoundManager::playSoundWithSubtitles to use uint32
instead of SoundFlag to avoid excess casting.
Add meaningful names to flags; add some comments.
Get rid of endian-unsafe SoundStatusUnion.
Fixes an issue with big-endian hosts.
No changes in behaviour on little-endian hosts.
Diffstat (limited to 'engines/lastexpress/entities/gendarmes.h')
| -rw-r--r-- | engines/lastexpress/entities/gendarmes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/lastexpress/entities/gendarmes.h b/engines/lastexpress/entities/gendarmes.h index 1cde626a22..c849597edf 100644 --- a/engines/lastexpress/entities/gendarmes.h +++ b/engines/lastexpress/entities/gendarmes.h @@ -87,7 +87,7 @@ public: DECLARE_FUNCTION(chapter5) private: - void handleAction(const SavePoint &savepoint, bool playSound = false, SoundFlag flag = kFlagInvalid, bool checkCallback = false, bool shouldUpdateEntity = false); + void handleAction(const SavePoint &savepoint, bool playSound = false, SoundFlag flag = kSoundVolumeEntityDefault, bool checkCallback = false, bool shouldUpdateEntity = false); }; } // End of namespace LastExpress |