aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/phantom/phantom_scenes.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-05-26 21:37:52 -0400
committerPaul Gilbert2016-05-26 21:37:52 -0400
commit78e52365bd1d8cdd56ddce6ae3d52ae04f9abd4c (patch)
treefb00b3cdbef3011a309b084d680d139750824701 /engines/mads/phantom/phantom_scenes.cpp
parentac8adb07c835885584517674b9b03bab14e8a772 (diff)
downloadscummvm-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/phantom_scenes.cpp')
-rw-r--r--engines/mads/phantom/phantom_scenes.cpp4
1 files changed, 2 insertions, 2 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());