CGE: Created a HorizLine stub class to hold the HL sprite array

5 files changed, 18 insertions, 8 deletions

diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 4fca901873..1fba9dfdc2 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
-	HL[0] = new Bitmap("HLINE", true);
-	HL[1] = NULL;
 	MC[0] = new Bitmap("MOUSE", true);
 	MC[1] = new Bitmap("DUMMY", true);
 	MC[2] = NULL;
@@ -96,7 +94,7 @@ void CGEEngine::setup() {
 	_sprite = new Sprite(this, NULL);
 	_miniCave = new Sprite(this, NULL);
 	_shadow = new Sprite(this, NULL);
-	_horzLine = new Sprite(this, HL);
+	_horzLine = new HorizLine(this);
 	_infoLine = new InfoLine(this, INFO_W);
 	_cavLight = new Sprite(this, PR);
 	_debugLine = new InfoLine(this, SCR_WID);
@@ -160,7 +158,6 @@ CGEEngine::~CGEEngine() {
 	delete _infoLine;
 	delete _cavLight;
 	delete _debugLine;
-	delete HL[0];
 	delete MC[0];
 	delete MC[1];
 	delete PR[0];
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 5f56899bc8..f74eda259e 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -70,12 +70,11 @@ Sprite *_pocket[POCKET_NX];
 Sprite *_sprite;
 Sprite *_miniCave;
 Sprite *_shadow;
-Sprite *_horzLine;
+HorizLine *_horzLine;
 InfoLine *_infoLine;
 Sprite *_cavLight;
 InfoLine *_debugLine;
 
-BMP_PTR HL[2];
 BMP_PTR MC[3];
 BMP_PTR PR[2];
 BMP_PTR SP[3];
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index ff2e5a0492..6455b0d3ca 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -175,11 +175,10 @@ extern Sprite *_pocket[];
 extern Sprite *_sprite;
 extern Sprite *_miniCave;
 extern Sprite *_shadow;
-extern Sprite *_horzLine;
+extern HorizLine *_horzLine;
 extern InfoLine *_infoLine;
 extern Sprite *_cavLight;
 extern InfoLine *_debugLine;
-extern BMP_PTR HL[2];
 extern BMP_PTR MC[3];
 extern BMP_PTR PR[2];
 extern BMP_PTR SP[3];
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index e1309c96f0..fb1c89ef5e 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -1360,4 +1360,15 @@ void Bitmap::hide(int x, int y) {
 	}
 }
 
+/*--------------------------------------------------------------------------*/
+
+HorizLine::HorizLine(CGEEngine *vm): Sprite(vm, NULL) {
+	// Set the sprite list
+	BMP_PTR *HL = new BMP_PTR[2];
+	HL[0] = new Bitmap("HLINE", true);
+	HL[1] = NULL;
+
+	setShapeList(HL);
+}
+
 } // End of namespace CGE
diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h
index b0cba4dcc0..d9aba0468e 100644
--- a/engines/cge/vga13h.h
+++ b/engines/cge/vga13h.h
@@ -306,6 +306,10 @@ public:
 	static void dacToPal(const Dac *tab, byte *palData);
 };
 
+class HorizLine: public Sprite {
+public:
+	HorizLine(CGEEngine *vm);
+};
 
 Dac mkDac(uint8 r, uint8 g, uint8 b);
 Rgb mkRgb(uint8 r, uint8 g, uint8 b);