From a89ce394bcaa9f967f2db7e9281bf25f381ceb69 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 28 Jun 2011 22:18:21 +1000
Subject: CGE: Fix initialisation of the TALK class

---
 engines/cge/cge.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'engines/cge/cge.cpp')

diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 2fd196f509..f2bebef258 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -32,6 +32,7 @@
 #include "cge/cge.h"
 #include "cge/vga13h.h"
 #include "cge/cge_main.h"
+#include "cge/talk.h"
 #include "cge/text.h"
 #include "cge/bitmaps.h"
 #include "cge/vol.h"
@@ -54,9 +55,10 @@ void CGEEngine::setup() {
 	_console = new CGEConsole(this);
 
 	// Initialise classes that have static members
-	BITMAP::init();
-	VFILE::init();
 	VGA::init();
+	VFILE::init();
+	BITMAP::init();
+	TALK::init();
 
 	// Initialise engine objects
 	Text = new TEXT(this, ProgName(), 128);
@@ -102,6 +104,7 @@ CGEEngine::~CGEEngine() {
 	debug("CGEEngine::~CGEEngine");
 
 	// Call classes with static members to clear them up
+	TALK::deinit();
 	BITMAP::deinit();
 	VFILE::deinit();
 	VGA::deinit();
-- 
cgit v1.2.3