aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/mads_scene.h
diff options
context:
space:
mode:
authorPaul Gilbert2010-04-21 10:42:01 +0000
committerPaul Gilbert2010-04-21 10:42:01 +0000
commit3edc151c5bde78eaa810a7ddc6092e9c920fb9c6 (patch)
treee5d852cedba0f65a248d3fa6846cb37734c075b6 /engines/m4/mads_scene.h
parent2e89d9607d9190e58bbd7f1f1689a758899309f7 (diff)
downloadscummvm-rg350-3edc151c5bde78eaa810a7ddc6092e9c920fb9c6.tar.gz
scummvm-rg350-3edc151c5bde78eaa810a7ddc6092e9c920fb9c6.tar.bz2
scummvm-rg350-3edc151c5bde78eaa810a7ddc6092e9c920fb9c6.zip
Changed MadsView into a separate class, since it's functionality is needed by two different class hierarchies that can't share a common ancestor class
svn-id: r48763
Diffstat (limited to 'engines/m4/mads_scene.h')
-rw-r--r--engines/m4/mads_scene.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/m4/mads_scene.h b/engines/m4/mads_scene.h
index 06f039d4e2..775c2bf766 100644
--- a/engines/m4/mads_scene.h
+++ b/engines/m4/mads_scene.h
@@ -27,6 +27,8 @@
#define M4_MADS_SCENE_H
#include "m4/scene.h"
+#include "m4/mads_logic.h"
+#include "m4/mads_views.h"
namespace M4 {
@@ -176,7 +178,7 @@ public:
#define DIRTY_AREA_SIZE 90
-class MadsScene : public Scene {
+class MadsScene : public Scene, public MadsView {
private:
MadsEngine *_vm;
MadsSceneResources _sceneResources;