diff options
| author | Paul Gilbert | 2016-05-26 21:37:52 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-05-26 21:37:52 -0400 |
| commit | 78e52365bd1d8cdd56ddce6ae3d52ae04f9abd4c (patch) | |
| tree | fb00b3cdbef3011a309b084d680d139750824701 /engines/mads/phantom | |
| parent | ac8adb07c835885584517674b9b03bab14e8a772 (diff) | |
| download | scummvm-rg350-78e52365bd1d8cdd56ddce6ae3d52ae04f9abd4c.tar.gz scummvm-rg350-78e52365bd1d8cdd56ddce6ae3d52ae04f9abd4c.tar.bz2 scummvm-rg350-78e52365bd1d8cdd56ddce6ae3d52ae04f9abd4c.zip | |
MADS: Refactor MSurface and Screen to not use virtual inheritance
Diffstat (limited to 'engines/mads/phantom')
| -rw-r--r-- | engines/mads/phantom/phantom_scenes.cpp | 4 | ||||
| -rw-r--r-- | engines/mads/phantom/phantom_scenes.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/mads/phantom/phantom_scenes.cpp b/engines/mads/phantom/phantom_scenes.cpp index 7ef627ceeb..bfb521e369 100644 --- a/engines/mads/phantom/phantom_scenes.cpp +++ b/engines/mads/phantom/phantom_scenes.cpp @@ -174,7 +174,7 @@ Common::String PhantomScene::formAnimName(char sepChar, int suffixNum) { /*------------------------------------------------------------------------*/ -void SceneInfoPhantom::loadCodes(MSurface &depthSurface, int variant) { +void SceneInfoPhantom::loadCodes(BaseSurface &depthSurface, int variant) { Common::String ext = Common::String::format(".WW%d", variant); Common::String fileName = Resources::formatName(RESPREFIX_RM, _sceneId, ext); if (!Common::File::exists(fileName)) @@ -190,7 +190,7 @@ void SceneInfoPhantom::loadCodes(MSurface &depthSurface, int variant) { f.close(); } -void SceneInfoPhantom::loadCodes(MSurface &depthSurface, Common::SeekableReadStream *stream) { +void SceneInfoPhantom::loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream) { byte *destP = (byte *)depthSurface.getPixels(); byte *walkMap = new byte[stream->size()]; stream->read(walkMap, stream->size()); diff --git a/engines/mads/phantom/phantom_scenes.h b/engines/mads/phantom/phantom_scenes.h index a6a8395a2c..6b7ab697f3 100644 --- a/engines/mads/phantom/phantom_scenes.h +++ b/engines/mads/phantom/phantom_scenes.h @@ -474,9 +474,9 @@ public: class SceneInfoPhantom : public SceneInfo { friend class SceneInfo; protected: - virtual void loadCodes(MSurface &depthSurface, int variant); + virtual void loadCodes(BaseSurface &depthSurface, int variant); - virtual void loadCodes(MSurface &depthSurface, Common::SeekableReadStream *stream); + virtual void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream); /** * Constructor |