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

1 files changed, 4 insertions, 2 deletions

diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index 7b3a84e98d..5ce21b4a57 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -137,7 +137,6 @@ MadsM4Engine::~MadsM4Engine() {
 	delete _inventory;
 	delete _viewManager;
 	delete _rails;
-	delete _converse;
 	delete _script;
 	delete _ws;
 	delete _random;
@@ -178,7 +177,6 @@ Common::Error MadsM4Engine::run() {
 	_viewManager = new ViewManager(this);
 	_inventory = new Inventory(this);
 	_sound = new Sound(this, _mixer, 255);
-	_converse = new Converse(this);
 	_script = new ScriptInterpreter(this);
 	_ws = new WoodScript(this);
 	_animation = new Animation(this);
@@ -304,6 +302,7 @@ M4Engine::M4Engine(OSystem *syst, const M4GameDescription *gameDesc): MadsM4Engi
 M4Engine::~M4Engine() {
 	delete _resourceManager;
 	delete _globals;
+	delete _converse;
 }
 
 Common::Error M4Engine::run() {
@@ -316,6 +315,9 @@ Common::Error M4Engine::run() {
 	// Set up needed common functionality
 	MadsM4Engine::run();
 
+	// M4 specific initialisation
+	_converse = new Converse(this);
+
 	_scene = new M4Scene(this);
 	_script->open("m4.dat");