libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: Renamed other previously unnamed object flag constants

Browse Source
This commit is contained in:
Paul Gilbert 2011-04-08 21:49:13 +10:00
parent fefcf7720d
commit 1c6b644483
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/tsage/core.cpp
View File

@ -351,7 +351,7 @@ void ObjectMover::dispatch() {
void ObjectMover::setup(const Common::Point &destPos) { void ObjectMover::setup(const Common::Point &destPos) {
_sceneObject->calcAngle(destPos); _sceneObject->calcAngle(destPos);
if ((_sceneObject->_objectWrapper) && !(_sceneObject->_flags & OBJFLAG_8)) if ((_sceneObject->_objectWrapper) && !(_sceneObject->_flags & OBJFLAG_SUPPRESS_DISPATCH))
_sceneObject->_objectWrapper->dispatch(); _sceneObject->_objectWrapper->dispatch();
// Get the difference // Get the difference
@ -1770,9 +1770,9 @@ void SceneObject::setStrip(int stripNum) {
void SceneObject::setStrip2(int stripNum) { void SceneObject::setStrip2(int stripNum) {
if (stripNum == -1) if (stripNum == -1)
_flags &= ~OBJFLAG_8; _flags &= ~OBJFLAG_SUPPRESS_DISPATCH;
else { else {
_flags |= OBJFLAG_8; _flags |= OBJFLAG_SUPPRESS_DISPATCH;
setStrip(stripNum); setStrip(stripNum);
} }
} }
@ -1888,7 +1888,7 @@ int SceneObject::checkRegion(const Common::Point &pt) {
List<SceneObject *>::iterator i; List<SceneObject *>::iterator i;
for (i = _globals->_sceneObjects->begin(); (regionIndex == 0) && (i != _globals->_sceneObjects->end()); ++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; int objYDiff = (*i)->_position.y - _yDiff;
if ((objYDiff >= yPos) && (objYDiff <= newY) && if ((objYDiff >= yPos) && (objYDiff <= newY) &&
((*i)->_xs < tempRect.right) && ((*i)->_xe > tempRect.left)) { ((*i)->_xs < tempRect.right) && ((*i)->_xe > tempRect.left)) {
@ -1987,7 +1987,7 @@ void SceneObject::checkAngle(const SceneObject *obj) {
void SceneObject::hide() { void SceneObject::hide() {
_flags |= OBJFLAG_HIDE; _flags |= OBJFLAG_HIDE;
if (_flags & OBJFLAG_200) if (_flags & OBJFLAG_HIDING)
_flags |= OBJFLAG_PANES; _flags |= OBJFLAG_PANES;
} }
@ -2320,7 +2320,7 @@ void SceneObjectList::draw() {
objList.push_back(obj); objList.push_back(obj);
if (!(obj->_flags & OBJFLAG_HIDE)) if (!(obj->_flags & OBJFLAG_HIDE))
obj->_flags &= ~OBJFLAG_200; obj->_flags &= ~OBJFLAG_HIDING;
// Reposition the bounds of the object to match the desired position // Reposition the bounds of the object to match the desired position
obj->reposition(); obj->reposition();
@ -2387,7 +2387,7 @@ redraw:
SceneObject *obj = objList[objIndex]; SceneObject *obj = objList[objIndex];
if (obj->_flags & OBJFLAG_HIDE) if (obj->_flags & OBJFLAG_HIDE)
obj->_flags |= OBJFLAG_200; obj->_flags |= OBJFLAG_HIDING;
obj->_flags &= ~flagMask; obj->_flags &= ~flagMask;
if (obj->_flags & OBJFLAG_REMOVE) { if (obj->_flags & OBJFLAG_REMOVE) {
obj->_flags |= OBJFLAG_PANES; obj->_flags |= OBJFLAG_PANES;
@ -2476,7 +2476,7 @@ void SceneObjectList::activate() {
// Replicate all existing objects on the old object list // Replicate all existing objects on the old object list
for (i = objectList->begin(); i != objectList->end(); ++i) { for (i = objectList->begin(); i != objectList->end(); ++i) {
SceneObject *sceneObj = (*i)->clone(); SceneObject *sceneObj = (*i)->clone();
sceneObj->_flags |= OBJFLAG_HIDE | OBJFLAG_REMOVE | OBJFLAG_800; sceneObj->_flags |= OBJFLAG_HIDE | OBJFLAG_REMOVE | OBJFLAG_CLONED;
push_front(sceneObj); push_front(sceneObj);
} }
} }
@ -2491,9 +2491,9 @@ void SceneObjectList::deactivate() {
List<SceneObject *>::iterator i; List<SceneObject *>::iterator i;
for (i = objectList->begin(); i != objectList->end(); ++i) { for (i = objectList->begin(); i != objectList->end(); ++i) {
if (!((*i)->_flags & OBJFLAG_800)) { if (!((*i)->_flags & OBJFLAG_CLONED)) {
SceneObject *sceneObj = (*i)->clone(); 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); _globals->_sceneObjects->push_front(sceneObj);
} }
} }

4
engines/tsage/core.h
View File

@ -497,8 +497,8 @@ public:
}; };
enum ObjectFlags {OBJFLAG_FIXED_PRIORITY = 1, OBJFLAG_NO_UPDATES = 2, OBJFLAG_ZOOMED = 4, 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_SUPPRESS_DISPATCH = 8, OBJFLAG_HIDE = 0x100, OBJFLAG_HIDING = 0x200, OBJFLAG_REMOVE = 0x400,
OBJFLAG_1000 = 0x1000, OBJFLAG_PANE_0 = 0x4000, OBJFLAG_PANE_1 = 0x8000, OBJFLAG_CLONED = 0x800, OBJFLAG_CHECK_REGION = 0x1000, OBJFLAG_PANE_0 = 0x4000, OBJFLAG_PANE_1 = 0x8000,
OBJFLAG_PANES = OBJFLAG_PANE_0 | OBJFLAG_PANE_1 OBJFLAG_PANES = OBJFLAG_PANE_0 | OBJFLAG_PANE_1
}; };