FULLPIPE: Further work on sceneSwitcher()

1 files changed, 13 insertions, 1 deletions

diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 305443249f..fb8a141646 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -30,6 +30,7 @@
 #include "fullpipe/fullpipe.h"
 #include "fullpipe/objectnames.h"
 #include "fullpipe/objects.h"
+#include "fullpipe/messagequeue.h"
 
 namespace Fullpipe {
 
@@ -58,21 +59,32 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 
 	_needQuit = false;
 
+	_aniMan = 0;
+	_scene2 = 0;
+
+	_globalMessageQueueList = 0;
+
 	g_fullpipe = this;
 }
 
 FullpipeEngine::~FullpipeEngine() {
 	delete _rnd;
+	delete _globalMessageQueueList;
 }
 
-Common::Error FullpipeEngine::run() {
+void FullpipeEngine::initialize() {
+	_globalMessageQueueList = new GlobalMessageQueueList;
+}
 
+Common::Error FullpipeEngine::run() {
 	const Graphics::PixelFormat format(2, 5, 6, 5, 0, 11, 5, 0, 0);
 	// Initialize backend
 	initGraphics(800, 600, true, &format);
 
 	_backgroundSurface.create(800, 600, format);
 
+	initialize();
+
 	_isSaveAllowed = false;
 
 	loadGam("fullpipe.gam");