From b1e50b4e304b267afda1c48a4edb77b21058ed45 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 21 Jun 2012 22:59:33 +0200
Subject: GOB: _renderFlags & 0x80 means "Do we have windows?"

---
 engines/gob/draw.h          | 2 +-
 engines/gob/draw_fascin.cpp | 4 ++--
 engines/gob/hotspots.cpp    | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines/gob')

diff --git a/engines/gob/draw.h b/engines/gob/draw.h
index 1359df632f..0c7f768341 100644
--- a/engines/gob/draw.h
+++ b/engines/gob/draw.h
@@ -32,7 +32,7 @@ namespace Gob {
 #define RENDERFLAG_COLLISIONS        0x0004
 #define RENDERFLAG_CAPTUREPOP        0x0008
 #define RENDERFLAG_USEDELTAS         0x0010
-#define RENDERFLAG_UNKNOWN           0x0080
+#define RENDERFLAG_HASWINDOWS        0x0080
 #define RENDERFLAG_NOBLITINVALIDATED 0x0200
 #define RENDERFLAG_NOSUBTITLES       0x0400
 #define RENDERFLAG_FROMSPLIT         0x0800
diff --git a/engines/gob/draw_fascin.cpp b/engines/gob/draw_fascin.cpp
index 69e04f74c9..54cd52b660 100644
--- a/engines/gob/draw_fascin.cpp
+++ b/engines/gob/draw_fascin.cpp
@@ -747,7 +747,7 @@ int16 Draw_Fascination::openWin(int16 id) {
 int16 Draw_Fascination::getWinFromCoord(int16 &dx, int16 &dy) {
 	int16 bestMatch = -1;
 
-	if ((_renderFlags & 128) == 0)
+	if (!(_renderFlags & RENDERFLAG_HASWINDOWS))
 		return -1;
 
 	for (int i = 0; i < 10; i++) {
@@ -790,7 +790,7 @@ int16 Draw_Fascination::handleCurWin() {
 	int8 matchNum = 0;
 	int16 bestMatch = -1;
 
-	if ((_vm->_game->_mouseButtons != 1) || ((_renderFlags & 128) == 0))
+	if ((_vm->_game->_mouseButtons != 1) || !(_renderFlags & RENDERFLAG_HASWINDOWS))
 		return 0;
 
 	for (int i = 0; i < 10; i++) {
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index 9a89f11923..c0f256c7d4 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -533,8 +533,9 @@ void Hotspots::leave(uint16 index) {
 }
 
 int16 Hotspots::curWindow(int16 &dx, int16 &dy) const {
-	if ((_vm->_draw->_renderFlags & 0x80)==0)
-		return(0);
+	if (!(_vm->_draw->_renderFlags & RENDERFLAG_HASWINDOWS))
+		return 0;
+
 	for (int i = 0; i < 10; i++) {
 		if (_vm->_draw->_fascinWin[i].id != -1) {
 			if (_vm->_global->_inter_mouseX >= _vm->_draw->_fascinWin[i].left &&
-- 
cgit v1.2.3