aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/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/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/scene.h')
-rw-r--r--engines/m4/scene.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/m4/scene.h b/engines/m4/scene.h
index e0a72fe848..633a34b549 100644
--- a/engines/m4/scene.h
+++ b/engines/m4/scene.h
@@ -35,8 +35,6 @@ class View;
#include "m4/viewmgr.h"
#include "m4/gui.h"
#include "m4/m4_views.h"
-#include "m4/mads_logic.h"
-#include "m4/mads_views.h"
#include "common/array.h"
namespace M4 {
@@ -76,7 +74,7 @@ class M4Engine;
class MadsEngine;
class InterfaceView;
-class Scene : public MadsView {
+class Scene : public View {
private:
HotSpotList _sceneHotspots;
protected: