aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/sound/queue.h
diff options
context:
space:
mode:
authorEvgeny Grechnikov2018-10-20 16:35:23 +0300
committerEvgeny Grechnikov2018-10-20 16:35:23 +0300
commitaf580eaa853b2434c0d237cff49f7f273444a06d (patch)
tree295dd4dfb9fadb348bd46bdc8512e16b19555c58 /engines/lastexpress/sound/queue.h
parent9f7ae73a7b7318311e5cc52d36e451cacfba8a02 (diff)
downloadscummvm-rg350-af580eaa853b2434c0d237cff49f7f273444a06d.tar.gz
scummvm-rg350-af580eaa853b2434c0d237cff49f7f273444a06d.tar.bz2
scummvm-rg350-af580eaa853b2434c0d237cff49f7f273444a06d.zip
LASTEXPRESS: save/load sound state
Warning: breaks compatibility with previous savefiles. They were mostly broken anyway, locking any NPC who waited for kActionEndSound when savefile was created.
Diffstat (limited to 'engines/lastexpress/sound/queue.h')
-rw-r--r--engines/lastexpress/sound/queue.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/lastexpress/sound/queue.h b/engines/lastexpress/sound/queue.h
index df8c945ee9..63ff091d80 100644
--- a/engines/lastexpress/sound/queue.h
+++ b/engines/lastexpress/sound/queue.h
@@ -46,7 +46,7 @@ public:
void stop(EntityIndex entity);
void updateQueue();
void stopAmbient();
- void stopAllExcept(SoundTag type1, SoundTag type2 = kSoundTagNone);
+ void stopAllExcept(SoundTag tag1, SoundTag tag2 = kSoundTagNone);
void destroyAllSound();
// State
@@ -58,10 +58,10 @@ public:
// Entries
void assignNISLink(EntityIndex index);
void fade(EntityIndex entity);
- void fade(SoundTag type);
+ void fade(SoundTag tag);
void fade(Common::String filename);
void endAmbient();
- SoundEntry *getEntry(SoundTag type);
+ SoundEntry *getEntry(SoundTag tag);
SoundEntry *getEntry(EntityIndex index);
SoundEntry *getEntry(Common::String name);
uint32 getEntryTime(EntityIndex index);
@@ -96,7 +96,6 @@ private:
// State & shared data
int _ambientState;
int32 _currentTag;
- // TODO: this seems to be a synchronization flag for the sound timer
uint32 _flag;
// Entries