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/scumm_v7.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/scumm_v7.h')
-rw-r--r-- | engines/scumm/scumm_v7.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/scumm_v7.h b/engines/scumm/scumm_v7.h index b8830be810..822ef7ca76 100644 --- a/engines/scumm/scumm_v7.h +++ b/engines/scumm/scumm_v7.h @@ -84,6 +84,7 @@ protected: struct SubtitleText : TextObject { bool actorSpeechMsg; }; + friend void syncWithSerializer(Common::Serializer &, SubtitleText &); #endif int _subtitleQueuePos; @@ -111,7 +112,7 @@ protected: virtual void akos_processQueue(); - virtual void saveOrLoad(Serializer *s); + virtual void saveLoadWithSerializer(Common::Serializer &s); virtual void readMAXS(int blockSize); virtual void readGlobalObjects(); |