From 7f57001e175ef2215e192968e9883e63145e7a50 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 7 Mar 2010 05:06:58 +0000 Subject: Split up the scene.cpp file into separate files for M4 and MADS specific scene code and support classes. Also have started adding code for textual display and proper current action display svn-id: r48172 --- engines/m4/m4.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'engines/m4/m4.h') diff --git a/engines/m4/m4.h b/engines/m4/m4.h index 6d79b47f5f..bebda02ca6 100644 --- a/engines/m4/m4.h +++ b/engines/m4/m4.h @@ -40,6 +40,8 @@ #include "m4/events.h" #include "m4/font.h" #include "m4/scene.h" +#include "m4/mads_scene.h" +#include "m4/m4_scene.h" #include "m4/actor.h" #include "m4/sound.h" #include "m4/rails.h" @@ -84,6 +86,7 @@ class M4InterfaceView; class ConversationView; class Actor; class Converse; +class MadsConversation; class ScriptInterpreter; class WoodScript; class Animation; @@ -193,7 +196,6 @@ public: ConversationView *_conversationView; Sound *_sound; Rails *_rails; - Converse *_converse; ScriptInterpreter *_script; WoodScript *_ws; Animation *_animation; @@ -203,6 +205,8 @@ public: }; class MadsEngine : public MadsM4Engine { +public: + MadsConversation _converse; public: MadsEngine(OSystem *syst, const M4GameDescription *gameDesc); virtual ~MadsEngine(); @@ -214,6 +218,8 @@ public: }; class M4Engine : public MadsM4Engine { +public: + Converse *_converse; public: M4Engine(OSystem *syst, const M4GameDescription *gameDesc); virtual ~M4Engine(); -- cgit v1.2.3