diff options
| author | Colin Snover | 2017-11-29 00:06:12 -0600 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-01-31 17:58:01 +0100 |
| commit | 9916b263831f20e5841275051a8ed014de1f24eb (patch) | |
| tree | bcd69585fa26cfa3c93ab60c7c480433fe9746f9 /engines/scumm/players/player_mac.h | |
| parent | 157ee95f64380215c3e6b1fed53be99607479582 (diff) | |
| download | scummvm-rg350-9916b263831f20e5841275051a8ed014de1f24eb.tar.gz scummvm-rg350-9916b263831f20e5841275051a8ed014de1f24eb.tar.bz2 scummvm-rg350-9916b263831f20e5841275051a8ed014de1f24eb.zip | |
SCUMM: Replace UB-triggering serialization code with Common::Serializer
Fixes Trac#10342.
Diffstat (limited to 'engines/scumm/players/player_mac.h')
| -rw-r--r-- | engines/scumm/players/player_mac.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/scumm/players/player_mac.h b/engines/scumm/players/player_mac.h index d247ce9883..897960d775 100644 --- a/engines/scumm/players/player_mac.h +++ b/engines/scumm/players/player_mac.h @@ -63,7 +63,7 @@ public: virtual bool endOfData() const { return false; } virtual int getRate() const { return _sampleRate; } - virtual void saveLoadWithSerializer(Serializer *ser); + virtual void saveLoadWithSerializer(Common::Serializer &ser); private: Common::Mutex _mutex; @@ -92,6 +92,7 @@ private: void generateSamples(int16 *data, int pitchModifier, int volume, int numSamples, int remainingSamplesOnNote, bool fadeNoteEnds); }; + friend void syncWithSerializer(Common::Serializer &, Instrument &); int _pitchTable[128]; int _numberOfChannels; @@ -120,6 +121,7 @@ protected: bool loadInstrument(Common::SeekableReadStream *stream); }; + friend void syncWithSerializer(Common::Serializer &, Channel &); ScummEngine *const _vm; Channel *_channel; |