diff options
author | strangerke | 2011-04-08 13:50:10 +0200 |
---|---|---|
committer | strangerke | 2011-04-08 13:50:10 +0200 |
commit | 7f951c65a3317d5f3dd4815bdd085f5c8ad1596f (patch) | |
tree | 6d6140bb49bc45df958edd889b0f9fb0a3ea6219 /engines | |
parent | e4d7f708053a5738028a76d03bdbcd677bd6fd96 (diff) | |
parent | 1c6b64448331719d8cea084d005f2a856ea74373 (diff) | |
download | scummvm-rg350-7f951c65a3317d5f3dd4815bdd085f5c8ad1596f.tar.gz scummvm-rg350-7f951c65a3317d5f3dd4815bdd085f5c8ad1596f.tar.bz2 scummvm-rg350-7f951c65a3317d5f3dd4815bdd085f5c8ad1596f.zip |
Merge branch 'tsage' of http://github.com/dreammaster/scummvm
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/converse.cpp | 8 | ||||
-rw-r--r-- | engines/tsage/core.cpp | 41 | ||||
-rw-r--r-- | engines/tsage/core.h | 8 | ||||
-rw-r--r-- | engines/tsage/ringworld_scenes1.cpp | 50 | ||||
-rw-r--r-- | engines/tsage/ringworld_scenes10.cpp | 18 | ||||
-rw-r--r-- | engines/tsage/ringworld_scenes2.cpp | 4 | ||||
-rw-r--r-- | engines/tsage/ringworld_scenes3.cpp | 66 | ||||
-rw-r--r-- | engines/tsage/ringworld_scenes4.cpp | 10 | ||||
-rw-r--r-- | engines/tsage/ringworld_scenes5.cpp | 52 | ||||
-rw-r--r-- | engines/tsage/ringworld_scenes6.cpp | 28 | ||||
-rw-r--r-- | engines/tsage/ringworld_scenes8.cpp | 8 |
11 files changed, 147 insertions, 146 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp index 07186c954b..a367ce540c 100644 --- a/engines/tsage/converse.cpp +++ b/engines/tsage/converse.cpp @@ -86,7 +86,7 @@ void SequenceManager::remove() { void SequenceManager::signal() { if (_globals->_sceneObjects->contains(&_sceneText)) - _sceneText.flag100(); + _sceneText.hide(); bool continueFlag = true; while (continueFlag) { @@ -189,10 +189,10 @@ void SequenceManager::signal() { _sceneObject->_moveDiff = Common::Point(v1, v2); break; case 17: - _sceneObject->flag100(); + _sceneObject->hide(); break; case 18: - _sceneObject->unflag100(); + _sceneObject->show(); break; case 19: v1 = getNextValue(); @@ -354,7 +354,7 @@ void SequenceManager::setMessage(int resNum, int lineNum, int colour, const Comm _sceneText.setup(msg); _sceneText.setPosition(Common::Point(textRect.left, textRect.top)); _sceneText.setPriority2(255); - _sceneText.unflag100(); + _sceneText.show(); // Set the delay based on the number of words int numWords = 0; diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index cbe9fd37b2..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 @@ -640,7 +640,7 @@ void PlayerMover::pathfind(Common::Point *routeList, Common::Point srcPos, Commo continue; Common::Point tempPt; - if (sub_F8E5(_globals->_walkRegions._field18[0]._pt1, _globals->_walkRegions._field18[0]._pt1, + if (sub_F8E5(_globals->_walkRegions._field18[0]._pt1, _globals->_walkRegions._field18[1]._pt1, _globals->_walkRegions._field18[var10]._pt1, _globals->_walkRegions._field18[var10]._pt2, &tempPt)) { // Add point to the route list _globals->_walkRegions._field18[0]._pt1 = tempPt; @@ -666,6 +666,7 @@ void PlayerMover::pathfind(Common::Point *routeList, Common::Point srcPos, Commo _globals->_walkRegions._field18[var10]._pt1, 1, objPos); } + _globals->_walkRegions._field18[0]._pt1 = objPos; *routeList++ = objPos; } } @@ -1769,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); } } @@ -1887,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)) { @@ -1984,15 +1985,15 @@ void SceneObject::checkAngle(const SceneObject *obj) { _objectWrapper->dispatch(); } -void SceneObject::flag100() { - _flags |= OBJFLAG_100; - if (_flags & OBJFLAG_200) +void SceneObject::hide() { + _flags |= OBJFLAG_HIDE; + if (_flags & OBJFLAG_HIDING) _flags |= OBJFLAG_PANES; } -void SceneObject::unflag100() { - if (_flags & OBJFLAG_100) { - _flags &= ~OBJFLAG_100; +void SceneObject::show() { + if (_flags & OBJFLAG_HIDE) { + _flags &= ~OBJFLAG_HIDE; _flags |= OBJFLAG_PANES; } } @@ -2068,7 +2069,7 @@ void SceneObject::remove() { if (_globals->_sceneObjects->contains(this)) // For objects in the object list, flag the object for removal in the next drawing, so that // the drawing code has a chance to restore the area previously covered by the object - _flags |= OBJFLAG_PANES | OBJFLAG_REMOVE | OBJFLAG_100; + _flags |= OBJFLAG_PANES | OBJFLAG_REMOVE | OBJFLAG_HIDE; else // Not in the list, so immediately remove the object removeObject(); @@ -2318,8 +2319,8 @@ void SceneObjectList::draw() { SceneObject *obj = *i; objList.push_back(obj); - if (!(obj->_flags & OBJFLAG_100)) - obj->_flags &= ~OBJFLAG_200; + if (!(obj->_flags & OBJFLAG_HIDE)) + obj->_flags &= ~OBJFLAG_HIDING; // Reposition the bounds of the object to match the desired position obj->reposition(); @@ -2370,7 +2371,7 @@ redraw: for (uint objIndex = 0; objIndex < objList.size(); ++objIndex) { SceneObject *obj = objList[objIndex]; - if ((obj->_flags & flagMask) && !(obj->_flags & OBJFLAG_100)) { + if ((obj->_flags & flagMask) && !(obj->_flags & OBJFLAG_HIDE)) { obj->_paneRects[paneNum] = obj->_bounds; obj->draw(); } @@ -2385,8 +2386,8 @@ redraw: for (uint objIndex = 0; objIndex < objList.size(); ++objIndex) { SceneObject *obj = objList[objIndex]; - if (obj->_flags & OBJFLAG_100) - obj->_flags |= OBJFLAG_200; + if (obj->_flags & OBJFLAG_HIDE) + obj->_flags |= OBJFLAG_HIDING; obj->_flags &= ~flagMask; if (obj->_flags & OBJFLAG_REMOVE) { obj->_flags |= OBJFLAG_PANES; @@ -2475,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_100 | OBJFLAG_REMOVE | OBJFLAG_800; + sceneObj->_flags |= OBJFLAG_HIDE | OBJFLAG_REMOVE | OBJFLAG_CLONED; push_front(sceneObj); } } @@ -2490,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_100 | 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 a65cec06b9..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_100 = 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 }; @@ -559,8 +559,8 @@ public: void animate(AnimateMode animMode, ...); SceneObject *clone() const; void checkAngle(const SceneObject *obj); - void flag100(); - void unflag100(); + void hide(); + void show(); int getSpliceArea(const SceneObject *obj); int getFrameCount(); diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp index 65a574c912..3facab40ea 100644 --- a/engines/tsage/ringworld_scenes1.cpp +++ b/engines/tsage/ringworld_scenes1.cpp @@ -53,8 +53,8 @@ void Scene10::Action1::signal() { scene->_stripManager.start(11, this, scene); break; case 3: - scene->_object2.flag100(); - scene->_object3.flag100(); + scene->_object2.hide(); + scene->_object3.hide(); scene->_object3.setAction(NULL); scene->_object4.animate(ANIM_MODE_5, this); break; @@ -66,23 +66,23 @@ void Scene10::Action1::signal() { scene->_object2.setStrip(3); scene->_object2.setFrame(1); scene->_object2.setPosition(Common::Point(240, 51)); - scene->_object2.unflag100(); + scene->_object2.show(); scene->_object3.setStrip(6); scene->_object3.setFrame(1); scene->_object3.setPosition(Common::Point(200, 76)); scene->_object3._numFrames = 20; - scene->_object3.unflag100(); + scene->_object3.show(); scene->_stripManager.start(12, this, scene); break; case 6: - scene->_object2.flag100(); - scene->_object3.flag100(); + scene->_object2.hide(); + scene->_object3.hide(); scene->_object1.animate(ANIM_MODE_6, this); break; case 7: - scene->_object3.unflag100(); + scene->_object3.show(); scene->_object3.setStrip2(5); scene->_object3._numFrames = 10; scene->_object3.setPosition(Common::Point(180, 87)); @@ -91,13 +91,13 @@ void Scene10::Action1::signal() { scene->_object2.setStrip(4); scene->_object2.setFrame(1); scene->_object2.setPosition(Common::Point(204, 59)); - scene->_object2.unflag100(); + scene->_object2.show(); scene->_stripManager.start(13, this, scene); break; case 8: - scene->_object2.flag100(); - scene->_object3.flag100(); + scene->_object2.hide(); + scene->_object3.hide(); scene->_object4.animate(ANIM_MODE_6, this); break; case 10: @@ -934,14 +934,14 @@ void Scene40::Action1::signal() { scene->_soundHandler.startSound(25); break; case 3: - scene->_doorway.flag100(); + scene->_doorway.hide(); scene->_dyingKzin.setPosition(Common::Point(296, 62)); _globals->_player.animate(ANIM_MODE_5, NULL); scene->_object1.setVisage(43); scene->_object1.setStrip(3); scene->_object1.animate(ANIM_MODE_5, NULL); - scene->_object2.flag100(); - scene->_object3.flag100(); + scene->_object2.hide(); + scene->_object3.hide(); scene->_stripManager.start(45, this); break; case 4: @@ -955,7 +955,7 @@ void Scene40::Action1::signal() { scene->_soundHandler.startSound(25); break; case 5: - scene->_doorway.unflag100(); + scene->_doorway.show(); scene->_doorway.setVisage(42); scene->_doorway.setStrip(3); scene->_doorway.setFrame(1); @@ -2520,7 +2520,7 @@ void Scene90::Object2::doAction(int action) { scene->_object6.setVisage(90); scene->_object6.setStrip(6); scene->_object6.setPosition(Common::Point(184, 210)); - scene->_object6.flag100(); + scene->_object6.hide(); scene->_sceneMode = 91; scene->_soundHandler1.startSound(59); @@ -2849,14 +2849,14 @@ void Scene6100::Action3::signal() { scene->_fadePercent = 0; _globals->_scenePalette.refresh(); scene->loadScene(9997); - scene->_object1.flag100(); - scene->_object2.flag100(); - scene->_object3.flag100(); - scene->_object6.flag100(); - scene->_object7.flag100(); - scene->_object8.flag100(); - scene->_object4.flag100(); - scene->_sceneText.flag100(); + scene->_object1.hide(); + scene->_object2.hide(); + scene->_object3.hide(); + scene->_object6.hide(); + scene->_object7.hide(); + scene->_object8.hide(); + scene->_object4.hide(); + scene->_sceneText.hide(); _globals->_events.setCursor(CURSOR_WALK); scene->_stripManager.start(8120, this); @@ -3014,7 +3014,7 @@ void Scene6100::Action6::signal() { Common::Point pt(scene->_object4._position.x, scene->_object4._position.y + 10); NpcMover *mover = new NpcMover(); scene->_object5.addMover(mover, &pt, NULL); - scene->_object5.unflag100(); + scene->_object5.show(); break; } case 1: { @@ -3118,7 +3118,7 @@ void Scene6100::postInit(SceneObjectList *OwnerList) { _object5._floats._float1 = 320.0; _object5._floats._float2 = 0.0; _object5._floats._float3 = 0.0; - _object5.flag100(); + _object5.hide(); _objList[0] = &_object6; _objList[1] = &_object7; diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp index 0afaedd26b..79606fa832 100644 --- a/engines/tsage/ringworld_scenes10.cpp +++ b/engines/tsage/ringworld_scenes10.cpp @@ -129,16 +129,16 @@ void Scene9100::postInit(SceneObjectList *OwnerList) { _globals->_player.postInit(); _object2.postInit(); - _object2.flag100(); + _object2.hide(); _object3.postInit(); - _object3.flag100(); + _object3.hide(); _object4.postInit(); - _object4.flag100(); + _object4.hide(); _object5.postInit(); - _object5.flag100(); + _object5.hide(); if (!_globals->getFlag(23)) { _object6.postInit(); @@ -290,7 +290,7 @@ void Scene9150::postInit(SceneObjectList *OwnerList) { // Walking with the tiger _sceneMode = 9151; _object2.postInit(); - _object2.flag100(); + _object2.hide(); _object1.postInit(); setAction(&_sequenceManager1, this, _sceneMode, &_globals->_player, &_object1, &_object2, 0); } @@ -397,7 +397,7 @@ void Scene9200::postInit(SceneObjectList *OwnerList) { _globals->_player.postInit(); _object3.postInit(); - _object3.flag100(); + _object3.hide(); _object1.postInit(); // Water animation _object1.setVisage(9200); @@ -1272,7 +1272,7 @@ void Scene9700::postInit(SceneObjectList *OwnerList) { _sceneHotspot6.quickInit(0, 22, 56, 275, 9700, 18, -1); _object1.postInit(); - _object1.flag100(); + _object1.hide(); _globals->_player.postInit(); if (_globals->getFlag(97)) { _globals->_player.disableControl(); @@ -1313,9 +1313,9 @@ void Scene9750::postInit(SceneObjectList *OwnerList) { _globals->_player.postInit(); _object1.postInit(); - _object1.flag100(); + _object1.hide(); _object2.postInit(); - _object2.flag100(); + _object2.hide(); _globals->_player.disableControl(); _sceneMode = 9751; setAction(&_sequenceManager, this, 9751, &_globals->_player, &_object1, &_object2, 0); diff --git a/engines/tsage/ringworld_scenes2.cpp b/engines/tsage/ringworld_scenes2.cpp index 1d3d0508fc..3573f40af2 100644 --- a/engines/tsage/ringworld_scenes2.cpp +++ b/engines/tsage/ringworld_scenes2.cpp @@ -108,7 +108,7 @@ void Scene1000::Action3::signal() { setDelay(60); break; case 4: - _globals->_player.unflag100(); + _globals->_player.show(); setDelay(240); break; case 5: { @@ -297,7 +297,7 @@ void Scene1000::postInit(SceneObjectList *OwnerList) { _globals->_player.setStrip(3); _globals->_player.setPosition(Common::Point(160, 191)); _globals->_player._moveDiff.x = 12; - _globals->_player.flag100(); + _globals->_player.hide(); _globals->_player.disableControl(); _globals->_sceneManager._scene->_sceneBounds.centre(_object3._position.x, _object3._position.y); diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp index 7e22f443d3..8a8730ca88 100644 --- a/engines/tsage/ringworld_scenes3.cpp +++ b/engines/tsage/ringworld_scenes3.cpp @@ -312,15 +312,15 @@ void Scene2000::Action14::signal() { break; case 3: _globals->_soundHandler.startSound(99); - scene->_object8.unflag100(); + scene->_object8.show(); scene->_object8.animate(ANIM_MODE_5, this); break; case 4: _globals->_soundHandler.startSound(12); scene->_object8.setStrip(2); scene->_object8.setFrame(1); - scene->_object9.unflag100(); - scene->_object10.unflag100(); + scene->_object9.show(); + scene->_object10.show(); setDelay(60); break; case 5: @@ -398,7 +398,7 @@ void Scene2000::postInit(SceneObjectList *OwnerList) { _object8.setVisage(2005); _object8.setPosition(Common::Point(169, 133)); _object8.setPriority(133); - _object8.flag100(); + _object8.hide(); _object9.postInit(); _object9.setVisage(2005); @@ -406,7 +406,7 @@ void Scene2000::postInit(SceneObjectList *OwnerList) { _object9.setFrame(4); _object9.setPosition(Common::Point(136, 86)); _object9.setPriority2(190); - _object9.flag100(); + _object9.hide(); _object10.postInit(); _object10.setVisage(2005); @@ -414,7 +414,7 @@ void Scene2000::postInit(SceneObjectList *OwnerList) { _object10.setFrame(4); _object10.setPosition(Common::Point(202, 86)); _object10.setPriority2(195); - _object10.flag100(); + _object10.hide(); switch (_globals->_sceneManager._previousScene) { case 1000: @@ -778,7 +778,7 @@ void Scene2100::Action9::signal() { break; case 2: scene->_soundHandler.startSound(99); - scene->_object4.unflag100(); + scene->_object4.show(); scene->_object4.animate(ANIM_MODE_5, this); break; case 3: @@ -793,7 +793,7 @@ void Scene2100::Action9::signal() { scene->_object4.animate(ANIM_MODE_6, this); break; case 5: - scene->_object4.flag100(); + scene->_object4.hide(); _globals->_events.setCursor(CURSOR_WALK); scene->_stripManager.start(6010, this); break; @@ -1095,7 +1095,7 @@ void Scene2100::Action14::signal() { break; case 4: scene->_soundHandler.startSound(99); - scene->_object4.unflag100(); + scene->_object4.show(); scene->_object4.animate(ANIM_MODE_5, this); break; case 5: @@ -1293,7 +1293,7 @@ void Scene2100::Action17::signal() { break; case 4: scene->_soundHandler.startSound(99); - scene->_object4.unflag100(); + scene->_object4.show(); scene->_object4.animate(ANIM_MODE_5, this); break; case 5: @@ -1732,7 +1732,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) { _object4.postInit(); _object4.setVisage(2102); _object4.setPosition(Common::Point(160, 199)); - _object4.flag100(); + _object4.hide(); setAction(&_action14); } else { @@ -1776,7 +1776,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) { _object4.postInit(); _object4.setVisage(2102); _object4.setPosition(Common::Point(160, 199)); - _object4.flag100(); + _object4.hide(); _sceneMode = 2107; setAction(&_sequenceManager, this, 2107, &_object4, NULL); @@ -1812,7 +1812,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) { _object4.postInit(); _object4.setVisage(2102); _object4.setPosition(Common::Point(160, 199)); - _object4.flag100(); + _object4.hide(); _globals->_inventory._stasisBox._sceneNumber = 0; setAction(&_action9); @@ -1828,7 +1828,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) { _object4.postInit(); _object4.setVisage(2102); _object4.setPosition(Common::Point(160, 199)); - _object4.flag100(); + _object4.hide(); _globals->clearFlag(15); _globals->clearFlag(109); _globals->clearFlag(72); @@ -1883,7 +1883,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) { _object4.postInit(); _object4.setVisage(2102); _object4.setPosition(Common::Point(160, 199)); - _object4.flag100(); + _object4.hide(); _sceneMode = 2103; setAction(&_sequenceManager, this, 2103, &_object4, NULL); @@ -2046,7 +2046,7 @@ void Scene2120::Action1::dispatch() { if ((scene->_subjectIndex == 27) && _globals->getFlag(70)) _globals->setFlag(75); - scene->_topicArrowHotspot.flag100(); + scene->_topicArrowHotspot.hide(); scene->_prevDbMode = scene->_dbMode; scene->_dbMode = 2; scene->_lineOffset = 0; @@ -2137,7 +2137,7 @@ void Scene2120::Action1::dispatch() { scene->_dbMode = scene->_prevDbMode; _actionIndex = scene->_prevDbMode + 1; - scene->_topicArrowHotspot.unflag100(); + scene->_topicArrowHotspot.show(); setDelay(1); } @@ -2716,7 +2716,7 @@ void Scene2200::Action3::signal() { } else { for (List<SceneObject *>::iterator i = _globals->_sceneObjects->begin(); i != _globals->_sceneObjects->end(); ++i) { - (*i)->flag100(); + (*i)->hide(); } _globals->_sceneManager._scene->loadScene(66); @@ -2753,7 +2753,7 @@ void Scene2200::Action3::signal() { case 7: for (List<SceneObject *>::iterator i = _globals->_sceneObjects->begin(); i != _globals->_sceneObjects->end(); ++i) - (*i)->unflag100(); + (*i)->show(); scene->_hotspot6.remove(); _globals->_sceneManager._scene->loadScene(2200); @@ -4892,7 +4892,7 @@ void Scene2310::signal() { _globals->_sceneObjects->draw(); _globals->_events.waitForPress(); - _sceneText.flag100(); + _sceneText.hide(); _globals->_sceneObjects->draw(); _globals->_sceneManager.changeScene(2200); @@ -4930,11 +4930,11 @@ void Scene2310::process(Event &event) { idx = findObject(idx); if (idx != 5) { - _wireList[idx].flag100(); + _wireList[idx].hide(); _globals->_sceneObjects->draw(); _wireList[idx].setFrame(frameNum); - _wireList[idx].unflag100(); + _wireList[idx].show(); _globals->_sceneObjects->draw(); } } else { @@ -5041,7 +5041,7 @@ void Scene2320::Action2::signal() { break; } case 1: - scene->_hotspot13.flag100(); + scene->_hotspot13.hide(); remove(); break; } @@ -5173,7 +5173,7 @@ void Scene2320::Action4::signal() { scene->_hotspot16.setStrip(3); scene->_hotspot16.setPriority2(149); scene->_hotspot16.setPosition(Common::Point(320, 202)); - scene->_hotspot16.unflag100(); + scene->_hotspot16.show(); Common::Point pt(320, 121); NpcMover *mover = new NpcMover(); @@ -5245,7 +5245,7 @@ void Scene2320::Action4::signal() { _globals->_player.setFrame(1); _globals->_player.animate(ANIM_MODE_1, NULL); - scene->_hotspot16.unflag100(); + scene->_hotspot16.show(); setDelay(3); break; case 14: { @@ -5279,7 +5279,7 @@ void Scene2320::Action4::signal() { scene->_hotspot16.remove(); scene->_soundHandler.startSound(253); - scene->_hotspot13.unflag100(); + scene->_hotspot13.show(); Common::Point pt(319, 157); NpcMover *mover = new NpcMover(); scene->_hotspot13.addMover(mover, &pt, this); @@ -5680,7 +5680,7 @@ void Scene2320::Hotspot14::doAction(int action) { scene->_hotspot8.postInit(); scene->_hotspot8.setVisage(2345); scene->_hotspot8.setPosition(Common::Point(634, 65)); - scene->_hotspot8.flag100(); + scene->_hotspot8.hide(); _globals->_sceneItems.push_front(&scene->_hotspot8); _globals->_inventory._waldos._sceneNumber = 2320; @@ -5690,13 +5690,13 @@ void Scene2320::Hotspot14::doAction(int action) { scene->_hotspot9._strip = 6; scene->_hotspot9.setPosition(Common::Point(536, 103)); scene->_hotspot9.setPriority2(200); - scene->_hotspot9.flag100(); + scene->_hotspot9.hide(); scene->_hotspot16.postInit(); scene->_hotspot16.setVisage(2345); scene->_hotspot16.setStrip(8); scene->_hotspot16.setPosition(Common::Point(536, 103)); - scene->_hotspot16.flag100(); + scene->_hotspot16.hide(); scene->_sceneMode = 2324; scene->setAction(&scene->_sequenceManager1, scene, 2324, &_globals->_player, &scene->_hotspot7, @@ -5895,7 +5895,7 @@ void Scene2320::postInit(SceneObjectList *OwnerList) { _hotspot8.postInit(); _hotspot8.setVisage(2345); _hotspot8.setPosition(Common::Point(634, 65)); - _hotspot8.flag100(); + _hotspot8.hide(); _sceneMode = 2325; setAction(&_sequenceManager1, this, 2325, &_globals->_player, &_hotspot6, &_hotspot8, &_hotspot7, NULL); @@ -5919,7 +5919,7 @@ void Scene2320::postInit(SceneObjectList *OwnerList) { _hotspot16._strip = 3; _hotspot16.setPriority2(160); _hotspot16.setPosition(Common::Point(320, 202)); - _hotspot16.flag100(); + _hotspot16.hide(); _sceneMode = 2338; setAction(&_sequenceManager1, this, 2338, &_globals->_player, &_hotspot16, &_hotspot13, NULL); @@ -5954,7 +5954,7 @@ void Scene2320::postInit(SceneObjectList *OwnerList) { _hotspot8.postInit(); _hotspot8.setVisage(2345); _hotspot8.setPosition(Common::Point(634, 65)); - _hotspot8.flag100(); + _hotspot8.hide(); _sceneMode = 2325; setAction(&_sequenceManager1, this, 2325, &_globals->_player, &_hotspot6, &_hotspot8, &_hotspot7, NULL); @@ -6058,7 +6058,7 @@ void Scene2400::Action1::signal() { ADD_MOVER(_globals->_player, 87, 338); break; case 5: - _globals->_player.flag100(); + _globals->_player.hide(); setDelay(60); break; case 6: diff --git a/engines/tsage/ringworld_scenes4.cpp b/engines/tsage/ringworld_scenes4.cpp index 4004f8460a..944930ad09 100644 --- a/engines/tsage/ringworld_scenes4.cpp +++ b/engines/tsage/ringworld_scenes4.cpp @@ -182,7 +182,7 @@ void Scene3700::Action1::signal() { break; case 3: scene->_soundHandler.startSound(196); - scene->_viewer.flag100(); + scene->_viewer.hide(); scene->_hotspot1.postInit(); scene->_hotspot1.setVisage(3710); @@ -194,7 +194,7 @@ void Scene3700::Action1::signal() { break; case 4: scene->_soundHandler.startSound(197); - scene->_hotspot1.flag100(); + scene->_hotspot1.hide(); scene->_hotspot2.postInit(); scene->_hotspot2.setVisage(3710); @@ -206,8 +206,8 @@ void Scene3700::Action1::signal() { break; case 5: scene->_soundHandler.startSound(198); - scene->_hotspot2.flag100(); - scene->_hotspot1.unflag100(); + scene->_hotspot2.hide(); + scene->_hotspot1.show(); setDelay(90); break; case 6: @@ -218,7 +218,7 @@ void Scene3700::Action1::signal() { break; case 8: scene->_hotspot1.remove(); - scene->_hotspot2.unflag100(); + scene->_hotspot2.show(); _globals->setFlag(59); setDelay(30); break; diff --git a/engines/tsage/ringworld_scenes5.cpp b/engines/tsage/ringworld_scenes5.cpp index 4db61b143b..fad83cdcf8 100644 --- a/engines/tsage/ringworld_scenes5.cpp +++ b/engines/tsage/ringworld_scenes5.cpp @@ -458,7 +458,7 @@ void Scene4000::Action12::signal() { } break; case 4: - scene->_hotspot9.flag100(); + scene->_hotspot9.hide(); scene->_stripManager.start(4020, this); break; case 5: @@ -687,7 +687,7 @@ void Scene4000::Hotspot::doAction(int action) { scene->_hotspot10.setVisage(4000); scene->_hotspot10.setStrip(5); scene->_hotspot10.setPosition(Common::Point(245, 147)); - scene->_hotspot10.flag100(); + scene->_hotspot10.hide(); _globals->_sceneItems.push_front(&scene->_hotspot10); if (_globals->_sceneObjects->contains(&scene->_hotspot8)) { @@ -1312,14 +1312,14 @@ void Scene4025::Action1::signal() { } break; case 1: - scene->_pegPtr->flag100(); + scene->_pegPtr->hide(); if (scene->_pegPtr2) { if (scene->_pegPtr->_armStrip == 3) scene->_pegPtr2->_strip = 2; scene->_pegPtr2->setPosition(scene->_pegPtr->_position); - scene->_pegPtr2->unflag100(); + scene->_pegPtr2->show(); scene->_pegPtr2->_armStrip = scene->_pegPtr->_armStrip; } @@ -1348,7 +1348,7 @@ void Scene4025::Action2::signal() { case 1: if (!scene->_pegPtr2) { // Getting a peg from a hole - scene->_holePtr->_pegPtr->flag100(); + scene->_holePtr->_pegPtr->hide(); scene->_pegPtr = scene->_holePtr->_pegPtr; scene->_pegPtr->_armStrip = 0; scene->_pegPtr->setPosition(Common::Point(-10, -10)); @@ -1358,14 +1358,14 @@ void Scene4025::Action2::signal() { // Placing a peg into a hole scene->_pegPtr2 = NULL; if (scene->_holePtr->_pegPtr) { - scene->_holePtr->_pegPtr->flag100(); + scene->_holePtr->_pegPtr->hide(); scene->_pegPtr2 = scene->_holePtr->_pegPtr; } assert(scene->_pegPtr); scene->_pegPtr->setPosition(scene->_holePtr->_newPosition); scene->_pegPtr->setStrip(1); - scene->_pegPtr->unflag100(); + scene->_pegPtr->show(); scene->_pegPtr->_armStrip = scene->_holePtr->_armStrip; scene->_holePtr->_pegPtr = scene->_pegPtr; @@ -1511,7 +1511,7 @@ void Scene4025::postInit(SceneObjectList *OwnerList) { _peg5.setVisage(4025); _peg5.setStrip(1); _peg5.setFrame(5); - _peg5.flag100(); + _peg5.hide(); _hole1.postInit(); _hole1.setVisage(4025); @@ -2769,14 +2769,14 @@ void Scene4150::Action1::signal() { scene->_hotspot1.animate(ANIM_MODE_NONE, NULL); scene->_hotspot1.setStrip(1); scene->_hotspot1.setFrame(1); - scene->_hotspot1.unflag100(); + scene->_hotspot1.show(); _globals->_player.setVisage(4200); _globals->_player.animate(ANIM_MODE_1, NULL); _globals->_player.setStrip(3); _globals->_player.setPosition(Common::Point(139, 166)); _globals->_player._moveDiff = Common::Point(7, 3); - _globals->_player.unflag100(); + _globals->_player.show(); setDelay(120); break; @@ -2815,7 +2815,7 @@ void Scene4150::Action2::signal() { _globals->_player.animate(ANIM_MODE_5, NULL); break; case 2: - _globals->_player.flag100(); + _globals->_player.hide(); scene->_hotspot1.setVisage(4153); scene->_hotspot1.setStrip(1); scene->_hotspot1.setFrame(1); @@ -3396,7 +3396,7 @@ void Scene4250::Hotspot6::doAction(int action) { scene->_hotspot2.setVisage(4251); scene->_hotspot2.setFrame(scene->_hotspot2.getFrameCount()); scene->_hotspot2.setPosition(Common::Point(267, 172)); - scene->_hotspot2.flag100(); + scene->_hotspot2.hide(); scene->_sceneMode = 4259; scene->setAction(&scene->_sequenceManager, scene, 4259, &_globals->_player, this, &scene->_hotspot2, NULL); @@ -3517,7 +3517,7 @@ void Scene4250::postInit(tSage::SceneObjectList *OwnerList) { if (_globals->getFlag(98)) { _globals->_sceneItems.push_front(&_hotspot6); } else { - _hotspot6.flag100(); + _hotspot6.hide(); if ((_globals->_stripNum == 4300) || (_globals->_stripNum == 4301)) { _globals->setFlag(98); _globals->_player.setVisage(4302); @@ -3709,7 +3709,7 @@ void Scene4300::Action1::signal() { scene->_hotspot10.animate(ANIM_MODE_5, this); break; case 8: - scene->_hotspot13.unflag100(); + scene->_hotspot13.show(); scene->_stripManager.start(8015, this, scene); break; case 9: @@ -4029,10 +4029,10 @@ void Scene4300::postInit(SceneObjectList *OwnerList) { _hotspot12.setStrip2(3); _hotspot12.setPosition(Common::Point(231, 185)); _hotspot12.setPriority2(251); - _hotspot12.flag100(); + _hotspot12.hide(); _hotspot13.postInit(); - _hotspot13.flag100(); + _hotspot13.hide(); _hotspot13.setVisage(4302); _hotspot13.setStrip2(2); _hotspot13.setPosition(Common::Point(256, 168)); @@ -4105,11 +4105,11 @@ void Scene4300::postInit(SceneObjectList *OwnerList) { void Scene4300::stripCallback(int v) { switch (v) { case 1: - _hotspot12.unflag100(); + _hotspot12.show(); _hotspot12.animate(ANIM_MODE_7, 0, NULL); break; case 2: - _hotspot12.flag100(); + _hotspot12.hide(); break; } } @@ -4211,7 +4211,7 @@ void Scene4301::Action1::signal() { scene->_hotspot3.setFrame(2); scene->_hotspot3.setPosition(Common::Point(48, 29)); scene->_hotspot3.setPriority2(255); - scene->_hotspot3.flag100(); + scene->_hotspot3.hide(); _field34E = 0; _state = 0; @@ -4220,10 +4220,10 @@ void Scene4301::Action1::signal() { case 10: _globals->_events.setCursor(CURSOR_NONE); scene->_soundHandler.startSound(337); - if (scene->_hotspot3._flags & OBJFLAG_100) - scene->_hotspot3.unflag100(); + if (scene->_hotspot3._flags & OBJFLAG_HIDE) + scene->_hotspot3.show(); else - scene->_hotspot3.flag100(); + scene->_hotspot3.hide(); setDelay(20); if (_state <= 8) @@ -4235,7 +4235,7 @@ void Scene4301::Action1::signal() { _buttonList[_state].remove(); scene->_soundHandler.startSound(338); - scene->_hotspot3.flag100(); + scene->_hotspot3.hide(); _actionIndex = 2; _state = 0; @@ -4245,10 +4245,10 @@ void Scene4301::Action1::signal() { _globals->_player.disableControl(); scene->_soundHandler.startSound(339); scene->_hotspot3._frame = 3; - if (scene->_hotspot3._flags & OBJFLAG_100) - scene->_hotspot3.unflag100(); + if (scene->_hotspot3._flags & OBJFLAG_HIDE) + scene->_hotspot3.show(); else - scene->_hotspot3.flag100(); + scene->_hotspot3.hide(); if (_state <= 8) _actionIndex = 20; diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp index a39f5d84b3..ccd857b5f9 100644 --- a/engines/tsage/ringworld_scenes6.cpp +++ b/engines/tsage/ringworld_scenes6.cpp @@ -53,7 +53,7 @@ void Scene5000::Action1::signal() { scene->_hotspot1._moveDiff.y = 1; scene->_hotspot4.setPosition(Common::Point(scene->_hotspot1._position.x, scene->_hotspot1._position.y + 15)); - scene->_hotspot4.unflag100(); + scene->_hotspot4.show(); setDelay(15); break; case 4: @@ -62,13 +62,13 @@ void Scene5000::Action1::signal() { break; case 5: scene->_hotspot3.animate(ANIM_MODE_8, 0, NULL); - scene->_hotspot3.unflag100(); + scene->_hotspot3.show(); ADD_MOVER(scene->_hotspot1, 233, 90); break; case 6: scene->_hotspot3.remove(); scene->_hotspot2.setPosition(Common::Point(233, 76)); - scene->_hotspot2.unflag100(); + scene->_hotspot2.show(); scene->_hotspot2.animate(ANIM_MODE_5, this); scene->_hotspot4.remove(); @@ -78,7 +78,7 @@ void Scene5000::Action1::signal() { scene->_hotspot2.remove(); break; case 8: - scene->_hotspot5.unflag100(); + scene->_hotspot5.show(); scene->_hotspot5.animate(ANIM_MODE_5, this); break; case 9: @@ -305,7 +305,7 @@ void Scene5000::Action4::signal() { ADD_MOVER(_globals->_player, 217, 76); break; case 11: - _globals->_player.flag100(); + _globals->_player.hide(); setDelay(60); break; case 12: @@ -465,20 +465,20 @@ void Scene5000::postInit(SceneObjectList *OwnerList) { _hotspot4.setPriority2(10); _hotspot4.changeZoom(100); _hotspot4.animate(ANIM_MODE_8, 0, NULL); - _hotspot4.flag100(); + _hotspot4.hide(); _hotspot2.postInit(); _hotspot2.setVisage(5001); _hotspot2.setStrip2(3); _hotspot2._numFrames = 5; - _hotspot2.flag100(); + _hotspot2.hide(); _hotspot3.postInit(); _hotspot3.setVisage(5001); _hotspot3.setStrip2(5); _hotspot3._numFrames = 5; _hotspot3.setPosition(Common::Point(233, 76)); - _hotspot3.flag100(); + _hotspot3.hide(); _hotspot5.postInit(); _hotspot5.setVisage(5001); @@ -486,7 +486,7 @@ void Scene5000::postInit(SceneObjectList *OwnerList) { _hotspot5._numFrames = 5; _hotspot5.setPriority2(15); _hotspot5.setPosition(Common::Point(218, 76)); - _hotspot5.flag100(); + _hotspot5.hide(); _hotspot9.postInit(); _hotspot9.setVisage(5002); @@ -525,12 +525,12 @@ void Scene5000::postInit(SceneObjectList *OwnerList) { if (_globals->getFlag(59)) { _hotspot1.setPosition(Common::Point(233, 90)); _hotspot1.changeZoom(100); - _hotspot1.unflag100(); + _hotspot1.show(); _hotspot5.setFrame(1); _hotspot5.animate(ANIM_MODE_5, NULL); _hotspot5.setPosition(Common::Point(218, 76)); - _hotspot5.unflag100(); + _hotspot5.show(); _globals->_player.setPosition(Common::Point(217, -10)); _globals->_player.disableControl(); @@ -550,10 +550,10 @@ void Scene5000::postInit(SceneObjectList *OwnerList) { _hotspot1.changeZoom(100); _hotspot1.setPosition(Common::Point(233, 90)); - _hotspot1.unflag100(); + _hotspot1.show(); _hotspot5.setFrame(_hotspot5.getFrameCount()); - _hotspot5.unflag100(); + _hotspot5.show(); _sceneMode = 5004; setAction(&_sequenceManager, this, 5004, &_globals->_player, NULL); @@ -2047,7 +2047,7 @@ void Scene5300::postInit(SceneObjectList *OwnerList) { _hotspot4.setStrip(2); _hotspot4.setPosition(Common::Point(89, 65)); _hotspot4.animate(ANIM_MODE_2, NULL); - _hotspot4.flag100(); + _hotspot4.hide(); if (_globals->getFlag(67)) { _globals->_player.postInit(); diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld_scenes8.cpp index 1721c04df9..0e4ba84346 100644 --- a/engines/tsage/ringworld_scenes8.cpp +++ b/engines/tsage/ringworld_scenes8.cpp @@ -126,7 +126,7 @@ void Scene7000::Action3::signal() { scene->_object4.setPosition(Common::Point(10, 18), 0); scene->_object4.setPriority2(10); scene->_object4.changeZoom(100); - scene->_object4.flag100(); + scene->_object4.hide(); break; case 1: { NpcMover *mover = new NpcMover(); @@ -137,7 +137,7 @@ void Scene7000::Action3::signal() { case 2: scene->_object3.setPriority2(10); scene->_object4.setPosition(Common::Point(scene->_object3._position.x, scene->_object3._position.y + 15), 0); - scene->_object4.unflag100(); + scene->_object4.show(); setDelay(30); break; case 3: { @@ -165,12 +165,12 @@ void Scene7000::Action4::signal() { scene->_object1.animate(ANIM_MODE_6, this); break; case 1: - scene->_object1.flag100(); + scene->_object1.hide(); setDelay(300); break; case 2: _globals->_soundHandler.startSound(252, 0, 127); - scene->_object1.unflag100(); + scene->_object1.show(); scene->_object1.setStrip(3); scene->_object1.setFrame(1); scene->_object1.animate(ANIM_MODE_5, this); |