diff options
author | Paul Gilbert | 2013-10-05 10:14:43 -0400 |
---|---|---|
committer | Paul Gilbert | 2013-10-05 10:14:43 -0400 |
commit | a3ae645ab5584a2f52024c83249c7639d23ea539 (patch) | |
tree | 0e90ce1342b308811fcc751dee27edf919e9fa1f /engines/tsage/ringworld2 | |
parent | 68d18053e563f3adde7842665cf2cd6a8f561b26 (diff) | |
download | scummvm-rg350-a3ae645ab5584a2f52024c83249c7639d23ea539.tar.gz scummvm-rg350-a3ae645ab5584a2f52024c83249c7639d23ea539.tar.bz2 scummvm-rg350-a3ae645ab5584a2f52024c83249c7639d23ea539.zip |
TSAGE: Implemented semi-transparent door in R2R suit room
Diffstat (limited to 'engines/tsage/ringworld2')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 52 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.h | 8 |
2 files changed, 46 insertions, 14 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 5995a6abe2..3470227cb3 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -5004,6 +5004,39 @@ bool Scene500::AirLock::startAction(CursorType action, Event &event) { } } +void Scene500::TransparentDoor::draw() { + // Determine the area of the screen to be updated + Rect destRect = _bounds; + destRect.translate(-g_globals->_sceneManager._scene->_sceneBounds.left, + -g_globals->_sceneManager._scene->_sceneBounds.top); + + // Get the frame to be drawn + GfxSurface frame = getFrame(); + + Graphics::Surface s = frame.lockSurface(); + Graphics::Surface screen = g_globals->gfxManager().getSurface().lockSurface(); + + for (int yp = 0; yp < s.h; ++yp) { + byte *frameSrcP = (byte *)s.getBasePtr(0, yp); + byte *screenP = (byte *)screen.getBasePtr(destRect.left, destRect.top + yp); + + for (int xp = 0; xp < s.w; ++xp, ++frameSrcP, ++screenP) { + if (*frameSrcP != frame._transColor && *frameSrcP < 6) { + *frameSrcP = R2_GLOBALS._fadePaletteMap[*frameSrcP][*screenP]; + } + } + } + + // Finished updating the frame + frame.unlockSurface(); + g_globals->gfxManager().getSurface().unlockSurface(); + + // Draw the processed frame + Region *priorityRegion = g_globals->_sceneManager._scene->_priorities.find(_priority); + g_globals->gfxManager().copyFrom(frame, destRect, priorityRegion); + +} + bool Scene500::Aerosol::startAction(CursorType action, Event &event) { Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene; @@ -5170,7 +5203,7 @@ void Scene500::PanelDialog::Button::doButtonPress() { if (R2_GLOBALS.getFlag(35)) { scene->_sceneMode = 5; scene->setAction(&scene->_sequenceManager1, scene, 509, &scene->_object1, - &scene->_suit, &scene->_object8, NULL); + &scene->_suit, &scene->_transparentDoor, NULL); } else { scene->_sound1.play(127); scene->_object1.animate(ANIM_MODE_6, scene); @@ -5184,7 +5217,7 @@ void Scene500::PanelDialog::Button::doButtonPress() { if (R2_GLOBALS.getFlag(35)) { scene->_sceneMode = 6; scene->setAction(&scene->_sequenceManager1, scene, 509, &scene->_object1, - &scene->_suit, &scene->_object8, NULL); + &scene->_suit, &scene->_transparentDoor, NULL); } else { scene->_sound1.play(127); scene->_object1.animate(ANIM_MODE_6, scene); @@ -5195,7 +5228,7 @@ void Scene500::PanelDialog::Button::doButtonPress() { if (R2_GLOBALS.getFlag(35)) { scene->_sceneMode = 509; scene->setAction(&scene->_sequenceManager1, scene, 509, &scene->_object1, - &scene->_suit, &scene->_object8, NULL); + &scene->_suit, &scene->_transparentDoor, NULL); } else { scene->_suit.postInit(); scene->_suit.hide(); @@ -5205,7 +5238,7 @@ void Scene500::PanelDialog::Button::doButtonPress() { scene->setAction(&scene->_sequenceManager1, scene, 508, &R2_GLOBALS._player, &scene->_object1, &scene->_suit, - &scene->_object8, NULL); + &scene->_transparentDoor, NULL); R2_GLOBALS.setFlag(35); } break; @@ -5222,7 +5255,6 @@ void Scene500::postInit(SceneObjectList *OwnerList) { SceneExt::postInit(); loadScene(500); - Common::fill(&_buffer[0], &_buffer[2710], 0); _stripManager.setColors(60, 255); _stripManager.setFontNumber(50); _stripManager.addSpeaker(&_seekerSpeaker); @@ -5322,13 +5354,13 @@ void Scene500::postInit(SceneObjectList *OwnerList) { _object1.setPosition(Common::Point(258, 99)); _object1.fixPriority(50); - _object8.postInit(); - _object8.setPosition(Common::Point(250, 111)); + _transparentDoor.postInit(); + _transparentDoor.setPosition(Common::Point(250, 111)); if (!R2_GLOBALS.getFlag(35)) { - _object8.setup(501, 3, 1); + _transparentDoor.setup(501, 3, 1); } else { - _object8.setup(500, 8, 7); + _transparentDoor.setup(500, 8, 7); _suit.postInit(); _suit._effect = 1; @@ -5399,7 +5431,7 @@ void Scene500::signal() { break; case 7: _sound1.play(126); - _object8.animate(ANIM_MODE_6, this); + _transparentDoor.animate(ANIM_MODE_6, this); R2_GLOBALS.clearFlag(35); _suit.remove(); diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h index 76a3f9a4c5..64361b2b08 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.h +++ b/engines/tsage/ringworld2/ringworld2_scenes0.h @@ -575,8 +575,9 @@ class Scene500: public SceneExt { public: virtual bool startAction(CursorType action, Event &event); }; - class Object8: public SceneActor { - // This classes uses a custom draw method + class TransparentDoor: public SceneActor { + public: + virtual void draw(); }; class Aerosol: public SceneActor { public: @@ -596,7 +597,6 @@ class Scene500: public SceneExt { }; public: int _stripNumber; - byte _buffer[2710]; SpeakerSeeker500 _seekerSpeaker; SpeakerQuinn500 _quinnSpeaker; SceneHotspot _background, _item2; @@ -607,7 +607,7 @@ public: Doorway _doorway; OxygenTanks _tanks1, _tanks2; AirLock _airLock; - Object8 _object8; + TransparentDoor _transparentDoor; Aerosol _aerosol; SonicStunner _sonicStunner; Locker1 _locker1; |