From 1e83e27925e121ee50b3ee66f5fb007e2d6b338f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Jul 2011 09:51:18 +1000
Subject: CGE: Moved MB sprite array into Square class

---
 engines/cge/cge.cpp      | 3 ---
 engines/cge/cge_main.cpp | 8 ++++++--
 engines/cge/cge_main.h   | 2 --
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'engines/cge')

diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 25fc4f7c00..4fca901873 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -69,8 +69,6 @@ void CGEEngine::setup() {
 	Talk::init();
 
 	// Initialise sprite arrays used by game objects
-	MB[0] = new Bitmap("BRICK", true);
-	MB[1] = NULL;
 	HL[0] = new Bitmap("HLINE", true);
 	HL[1] = NULL;
 	MC[0] = new Bitmap("MOUSE", true);
@@ -162,7 +160,6 @@ CGEEngine::~CGEEngine() {
 	delete _infoLine;
 	delete _cavLight;
 	delete _debugLine;
-	delete MB[0];
 	delete HL[0];
 	delete MC[0];
 	delete MC[1];
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 256cee6795..5f56899bc8 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -75,7 +75,6 @@ InfoLine *_infoLine;
 Sprite *_cavLight;
 InfoLine *_debugLine;
 
-BMP_PTR MB[2];
 BMP_PTR HL[2];
 BMP_PTR MC[3];
 BMP_PTR PR[2];
@@ -516,9 +515,14 @@ private:
 
 
 SQUARE::SQUARE(CGEEngine *vm)
-	: Sprite(vm, MB), _vm(vm) {
+	: Sprite(vm, NULL), _vm(vm) {
 	_flags._kill = true;
 	_flags._bDel = false;
+
+	BMP_PTR *MB = new BMP_PTR[2];
+	MB[0] = new Bitmap("BRICK", true);
+	MB[1] = NULL;
+	setShapeList(MB);
 }
 
 
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index 17925f76f9..ff2e5a0492 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -179,8 +179,6 @@ extern Sprite *_horzLine;
 extern InfoLine *_infoLine;
 extern Sprite *_cavLight;
 extern InfoLine *_debugLine;
-extern BMP_PTR MB[2];
-extern BMP_PTR MB[2];
 extern BMP_PTR HL[2];
 extern BMP_PTR MC[3];
 extern BMP_PTR PR[2];
-- 
cgit v1.2.3