From d2027b029090bbfabd78c64786d70fadb597d54a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 14 Nov 2011 18:24:11 +0100
Subject: CGE: Rename a structure member using double-underscore (reserved)

Also removed a useless comment
---
 engines/cge/vga13h.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index 49cfcd3084..47b77688f7 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -492,7 +492,7 @@ void Sprite::sync(Common::Serializer &s) {
 		_flags._near = flags & 0x0002 ? true : false;
 		_flags._drag = flags & 0x0004 ? true : false;
 		_flags._hold = flags & 0x0008 ? true : false;
-		_flags._____ = flags & 0x0010 ? true : false;
+		_flags._dummy = flags & 0x0010 ? true : false;
 		_flags._slav = flags & 0x0020 ? true : false;
 		_flags._syst = flags & 0x0040 ? true : false;
 		_flags._kill = flags & 0x0080 ? true : false;
@@ -516,7 +516,7 @@ void Sprite::sync(Common::Serializer &s) {
 		flags = (flags << 1) | _flags._kill;
 		flags = (flags << 1) | _flags._syst;
 		flags = (flags << 1) | _flags._slav;
-		flags = (flags << 1) | _flags._____;
+		flags = (flags << 1) | _flags._dummy;
 		flags = (flags << 1) | _flags._hold;
 		flags = (flags << 1) | _flags._drag;
 		flags = (flags << 1) | _flags._near;
-- 
cgit v1.2.3


From da626f786d30c59002cbd4348f01a759ae55d75c Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 27 Nov 2011 08:34:47 +0100
Subject: CGE: Remove unused functions, moveVmap() and moveShapes().

---
 engines/cge/vga13h.cpp | 7 -------
 1 file changed, 7 deletions(-)

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

diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index 47b77688f7..e271895935 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -115,13 +115,6 @@ BitmapPtr *Sprite::setShapeList(BitmapPtr *shpP) {
 	return r;
 }
 
-void Sprite::moveShapes(uint8 *buf) {
-	BitmapPtr *p;
-	for (p = _ext->_shpList; *p; p++) {
-		buf += (*p)->moveVmap(buf);
-	}
-}
-
 bool Sprite::works(Sprite *spr) {
 	if (!spr || !spr->_ext)
 		return false;
-- 
cgit v1.2.3


From b3c9b51e4638afa3fb2afd32d2a9b3e16153d0e3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 28 Nov 2011 18:54:01 +0100
Subject: CGE: Add to the console a function to display boundaries

---
 engines/cge/vga13h.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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

diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index e271895935..fb81925a7f 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -625,7 +625,7 @@ Sprite *Queue::locate(int ref) {
 	return NULL;
 }
 
-Vga::Vga() : _frmCnt(0), _msg(NULL), _name(NULL), _setPal(false), _mono(0) {
+Vga::Vga(CGEEngine *vm) : _frmCnt(0), _msg(NULL), _name(NULL), _setPal(false), _mono(0), _vm(vm) {
 	_oldColors = NULL;
 	_newColors = NULL;
 	_showQ = new Queue(true);
@@ -822,6 +822,19 @@ void Vga::update() {
 		updateColors();
 		_setPal = false;
 	}
+	if (_vm->_showBoundariesFl) {
+		Vga::_page[0]->hLine(0, 200 - kPanHeight, 320, 0xee);
+		if (_vm->_barriers[_vm->_now]._horz != 255) {
+			warning("hBar %d", _vm->_barriers[_vm->_now]._horz);
+			for (int i = 0; i < 8; i++)
+				Vga::_page[0]->vLine((_vm->_barriers[_vm->_now]._horz * 8) + i, 0, 200, 0xff);
+		}
+		if (_vm->_barriers[_vm->_now]._vert != 255) {
+			warning("vBar %d", _vm->_barriers[_vm->_now]._vert);
+			for (int i = 0; i < 4; i++)
+				Vga::_page[0]->hLine(0, 80 + (_vm->_barriers[_vm->_now]._vert * 4) + i, 320, 0xff);
+		}
+	}
 
 	g_system->copyRectToScreen((const byte *)Vga::_page[0]->getBasePtr(0, 0), kScrWidth, 0, 0, kScrWidth, kScrHeight);
 	g_system->updateScreen();
-- 
cgit v1.2.3


From 5954b8bfeb679e67efbd51ab5ead62a946de737d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 28 Nov 2011 18:55:13 +0100
Subject: CGE: Remove useless debugging traces

---
 engines/cge/vga13h.cpp | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index fb81925a7f..186de24036 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -825,12 +825,10 @@ void Vga::update() {
 	if (_vm->_showBoundariesFl) {
 		Vga::_page[0]->hLine(0, 200 - kPanHeight, 320, 0xee);
 		if (_vm->_barriers[_vm->_now]._horz != 255) {
-			warning("hBar %d", _vm->_barriers[_vm->_now]._horz);
 			for (int i = 0; i < 8; i++)
 				Vga::_page[0]->vLine((_vm->_barriers[_vm->_now]._horz * 8) + i, 0, 200, 0xff);
 		}
 		if (_vm->_barriers[_vm->_now]._vert != 255) {
-			warning("vBar %d", _vm->_barriers[_vm->_now]._vert);
 			for (int i = 0; i < 4; i++)
 				Vga::_page[0]->hLine(0, 80 + (_vm->_barriers[_vm->_now]._vert * 4) + i, 320, 0xff);
 		}
-- 
cgit v1.2.3