diff options
author | Dmitry Iskrich | 2016-06-29 19:24:12 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2016-08-03 23:40:36 +0200 |
commit | b208b8e5fffc6a13277987d98400488c4d59d9c1 (patch) | |
tree | d989483eefaf6aa749714c523a8c075ac7770abe /engines/director/director.h | |
parent | aaf8448cbc0a282a1c28f0ef4d7c738c8b87ab3b (diff) | |
download | scummvm-rg350-b208b8e5fffc6a13277987d98400488c4d59d9c1.tar.gz scummvm-rg350-b208b8e5fffc6a13277987d98400488c4d59d9c1.tar.bz2 scummvm-rg350-b208b8e5fffc6a13277987d98400488c4d59d9c1.zip |
DIRECTOR: Fix memory corruption
Diffstat (limited to 'engines/director/director.h')
-rw-r--r-- | engines/director/director.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/director/director.h b/engines/director/director.h index 82c43fd90c..a3e0ad0dbb 100644 --- a/engines/director/director.h +++ b/engines/director/director.h @@ -24,6 +24,7 @@ #define DIRECTOR_DIRECTOR_H #include "common/scummsys.h" +#include "common/substream.h" #include "common/str.h" #include "common/hashmap.h" @@ -67,9 +68,9 @@ public: const byte *getPalette() const { return _currentPalette; } uint16 getPaletteColorCount() const { return _currentPaletteLength; } void loadSharedCastsFrom(Common::String filename); - Common::HashMap<int, Common::SeekableReadStream *> getSharedDIB() const { return _sharedDIB; } - Common::HashMap<int, Common::SeekableReadStream *> getSharedSTXT() const { return _sharedSTXT; } - Common::HashMap<int, Cast *> getSharedCasts() const { return _sharedCasts; } + Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *getSharedDIB() const { return _sharedDIB; } + Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *getSharedSTXT() const { return _sharedSTXT; } + Common::HashMap<int, Cast *> *getSharedCasts() const { return _sharedCasts; } Common::HashMap<Common::String, Score *> *_movies; Score *_currentScore; @@ -93,10 +94,10 @@ private: Common::String readPascalString(Common::SeekableReadStream &stream); Common::String _sharedMMM; - Common::HashMap<int, Cast *> _sharedCasts; - Common::HashMap<int, Common::SeekableReadStream *> _sharedDIB; - Common::HashMap<int, Common::SeekableReadStream *> _sharedSTXT; - Common::HashMap<int, Common::SeekableReadStream *> _sharedSound; + Common::HashMap<int, Cast *> *_sharedCasts; + Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *_sharedDIB; + Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *_sharedSTXT; + Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *_sharedSound; Archive *_mainArchive; Common::MacResManager *_macBinary; |