diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/mads/scene_data.h | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/mads/scene_data.h')
| -rw-r--r-- | engines/mads/scene_data.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/mads/scene_data.h b/engines/mads/scene_data.h index 41a08f74eb..a28c42c5ab 100644 --- a/engines/mads/scene_data.h +++ b/engines/mads/scene_data.h @@ -189,36 +189,36 @@ public: * loads the data */ void load(int sceneId, int variant, const Common::String &resName, int flags, - DepthSurface &depthSurface, MSurface &bgSurface); + DepthSurface &depthSurface, BaseSurface &bgSurface); /** * Loads the palette for a scene */ - void loadPalette(int sceneId, int artFileNum, const Common::String &resName, int flags, MSurface &bgSurface); + void loadPalette(int sceneId, int artFileNum, const Common::String &resName, int flags, BaseSurface &bgSurface); /** * Loads a V1 game background */ - void loadMadsV1Background(int sceneId, const Common::String &resName, int flags, MSurface &bgSurface); + void loadMadsV1Background(int sceneId, const Common::String &resName, int flags, BaseSurface &bgSurface); /** * Loads a V2 game background */ - void loadMadsV2Background(int sceneId, const Common::String &resName, int flags, MSurface &bgSurface); + void loadMadsV2Background(int sceneId, const Common::String &resName, int flags, BaseSurface &bgSurface); /** * Loads the given surface with depth information of a given scene * @param depthSurface Depth/walk surface * @param variant Variant number to load */ - virtual void loadCodes(MSurface &depthSurface, int variant) = 0; + virtual void loadCodes(BaseSurface &depthSurface, int variant) = 0; /** * Loads the given surface with depth information of a given scene * @param depthSurface Depth/walk surface * @param stream Stream to load the data from */ - virtual void loadCodes(MSurface &depthSurface, Common::SeekableReadStream *stream) = 0; + virtual void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream) = 0; }; } // End of namespace MADS |