From 1c6b64448331719d8cea084d005f2a856ea74373 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 8 Apr 2011 21:49:13 +1000
Subject: TSAGE: Renamed other previously unnamed object flag constants

---
 engines/tsage/core.cpp | 20 ++++++++++----------
 engines/tsage/core.h   |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index add18aa5c4..c550b603d7 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -351,7 +351,7 @@ void ObjectMover::dispatch() {
 void ObjectMover::setup(const Common::Point &destPos) {
 	_sceneObject->calcAngle(destPos);
 
-	if ((_sceneObject->_objectWrapper) && !(_sceneObject->_flags & OBJFLAG_8))
+	if ((_sceneObject->_objectWrapper) && !(_sceneObject->_flags & OBJFLAG_SUPPRESS_DISPATCH))
 		_sceneObject->_objectWrapper->dispatch();
 
 	// Get the difference
@@ -1770,9 +1770,9 @@ void SceneObject::setStrip(int stripNum) {
 
 void SceneObject::setStrip2(int stripNum) {
 	if (stripNum == -1)
-		_flags &= ~OBJFLAG_8;
+		_flags &= ~OBJFLAG_SUPPRESS_DISPATCH;
 	else {
-		_flags |= OBJFLAG_8;
+		_flags |= OBJFLAG_SUPPRESS_DISPATCH;
 		setStrip(stripNum);
 	}
 }
@@ -1888,7 +1888,7 @@ int SceneObject::checkRegion(const Common::Point &pt) {
 
 	List<SceneObject *>::iterator i;
 	for (i = _globals->_sceneObjects->begin(); (regionIndex == 0) && (i != _globals->_sceneObjects->end()); ++i) {
-		if ((*i) && ((*i)->_flags & OBJFLAG_1000)) {
+		if ((*i) && ((*i)->_flags & OBJFLAG_CHECK_REGION)) {
 			int objYDiff = (*i)->_position.y - _yDiff;
 			if ((objYDiff >= yPos) && (objYDiff <= newY) &&
 				((*i)->_xs < tempRect.right) && ((*i)->_xe > tempRect.left)) {
@@ -1987,7 +1987,7 @@ void SceneObject::checkAngle(const SceneObject *obj) {
 
 void SceneObject::hide() {
 	_flags |= OBJFLAG_HIDE;
-	if (_flags & OBJFLAG_200)
+	if (_flags & OBJFLAG_HIDING)
 		_flags |= OBJFLAG_PANES;
 }
 
@@ -2320,7 +2320,7 @@ void SceneObjectList::draw() {
 			objList.push_back(obj);
 
 			if (!(obj->_flags & OBJFLAG_HIDE))
-				obj->_flags &= ~OBJFLAG_200;
+				obj->_flags &= ~OBJFLAG_HIDING;
 
 			// Reposition the bounds of the object to match the desired position
 			obj->reposition();
@@ -2387,7 +2387,7 @@ redraw:
 			SceneObject *obj = objList[objIndex];
 
 			if (obj->_flags & OBJFLAG_HIDE)
-				obj->_flags |= OBJFLAG_200;
+				obj->_flags |= OBJFLAG_HIDING;
 			obj->_flags &= ~flagMask;
 			if (obj->_flags & OBJFLAG_REMOVE) {
 				obj->_flags |= OBJFLAG_PANES;
@@ -2476,7 +2476,7 @@ void SceneObjectList::activate() {
 	// Replicate all existing objects on the old object list
 	for (i = objectList->begin(); i != objectList->end(); ++i) {
 		SceneObject *sceneObj = (*i)->clone();
-		sceneObj->_flags |= OBJFLAG_HIDE | OBJFLAG_REMOVE | OBJFLAG_800;
+		sceneObj->_flags |= OBJFLAG_HIDE | OBJFLAG_REMOVE | OBJFLAG_CLONED;
 		push_front(sceneObj);
 	}
 }
@@ -2491,9 +2491,9 @@ void SceneObjectList::deactivate() {
 
 	List<SceneObject *>::iterator i;
 	for (i = objectList->begin(); i != objectList->end(); ++i) {
-		if (!((*i)->_flags & OBJFLAG_800)) {
+		if (!((*i)->_flags & OBJFLAG_CLONED)) {
 			SceneObject *sceneObj = (*i)->clone();
-			sceneObj->_flags |= OBJFLAG_HIDE | OBJFLAG_REMOVE | OBJFLAG_800;
+			sceneObj->_flags |= OBJFLAG_HIDE | OBJFLAG_REMOVE | OBJFLAG_CLONED;
 			_globals->_sceneObjects->push_front(sceneObj);
 		}
 	}
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 5fcde5e2fe..79bf89145d 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -497,8 +497,8 @@ public:
 };
 
 enum ObjectFlags {OBJFLAG_FIXED_PRIORITY = 1, OBJFLAG_NO_UPDATES = 2, OBJFLAG_ZOOMED = 4, 
-	OBJFLAG_8 = 8, OBJFLAG_HIDE = 0x100, OBJFLAG_200 = 0x200, OBJFLAG_REMOVE = 0x400, OBJFLAG_800 = 0x800,
-	OBJFLAG_1000 = 0x1000, OBJFLAG_PANE_0 = 0x4000, OBJFLAG_PANE_1 = 0x8000, 
+	OBJFLAG_SUPPRESS_DISPATCH = 8, OBJFLAG_HIDE = 0x100, OBJFLAG_HIDING = 0x200, OBJFLAG_REMOVE = 0x400, 
+	OBJFLAG_CLONED = 0x800, OBJFLAG_CHECK_REGION = 0x1000, OBJFLAG_PANE_0 = 0x4000, OBJFLAG_PANE_1 = 0x8000, 
 	OBJFLAG_PANES = OBJFLAG_PANE_0 | OBJFLAG_PANE_1
 };
 
-- 
cgit v1.2.3