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/cge_main.cpp | 2 --
 engines/cge/vga13h.cpp   | 4 ++--
 engines/cge/vga13h.h     | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'engines/cge')

diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 53078fe8f8..532ebdc9a6 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -1339,9 +1339,7 @@ void CGEEngine::runGame() {
 
 	_vga->_showQ->append(_mouse);
 
-//    ___________
 	loadUser();
-//    ~~~~~~~~~~~
 
 	if ((_sprite = _vga->_spareQ->locate(121)) != NULL)
 		_commandHandlerTurbo->addCommand(kCmdSeq, -1, _vga->_mono, _sprite);
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;
diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h
index 0c514c4a66..559fa78cdb 100644
--- a/engines/cge/vga13h.h
+++ b/engines/cge/vga13h.h
@@ -91,7 +91,7 @@ public:
 		uint16 _near : 1;       // Near action lock
 		uint16 _drag : 1;       // sprite is moveable
 		uint16 _hold : 1;       // sprite is held with mouse
-		uint16 _____ : 1;       // intrrupt driven animation
+		uint16 _dummy : 1;       // intrrupt driven animation
 		uint16 _slav : 1;       // slave object
 		uint16 _syst : 1;       // system object
 		uint16 _kill : 1;       // dispose memory after remove
-- 
cgit v1.2.3