diff options
author | Martin Kiewitz | 2009-10-14 18:09:54 +0000 |
---|---|---|
committer | Martin Kiewitz | 2009-10-14 18:09:54 +0000 |
commit | 8e58d5ef80bf8a0e33a7ef698881ab20362f332a (patch) | |
tree | 767602d8826ec3879ad1c42314efea5956a42653 /engines/sci/gui | |
parent | 20036d3cb4705404710519653cb0f5da56d90da7 (diff) | |
download | scummvm-rg350-8e58d5ef80bf8a0e33a7ef698881ab20362f332a.tar.gz scummvm-rg350-8e58d5ef80bf8a0e33a7ef698881ab20362f332a.tar.bz2 scummvm-rg350-8e58d5ef80bf8a0e33a7ef698881ab20362f332a.zip |
SCI: kDrawPic now reads out blackout flag for transitions
svn-id: r45089
Diffstat (limited to 'engines/sci/gui')
-rw-r--r-- | engines/sci/gui/gui.cpp | 4 | ||||
-rw-r--r-- | engines/sci/gui/gui.h | 2 | ||||
-rw-r--r-- | engines/sci/gui/gui_transitions.cpp | 3 | ||||
-rw-r--r-- | engines/sci/gui/gui_transitions.h | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index 5fac9a86ef..a39b08c0bd 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -300,13 +300,13 @@ void SciGui::clearMenuBar() { // TODO: Implement menubar } -void SciGui::drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo) { +void SciGui::drawPicture(GuiResourceId pictureId, int16 animationNr, bool animationBlackoutFlag, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo) { GuiPort *oldPort = _gfx->SetPort((GuiPort *)_windowMgr->_picWind); if (_windowMgr->isFrontWindow(_windowMgr->_picWind)) { _screen->_picNotValid = 1; _gfx->drawPicture(pictureId, animationNr, mirroredFlag, addToFlag, EGApaletteNo); - _transitions->setup(animationNr); + _transitions->setup(animationNr, animationBlackoutFlag); } else { _windowMgr->BeginUpdate(_windowMgr->_picWind); _gfx->drawPicture(pictureId, animationNr, mirroredFlag, addToFlag, EGApaletteNo); diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h index 47ba512b18..3073aeed38 100644 --- a/engines/sci/gui/gui.h +++ b/engines/sci/gui/gui.h @@ -80,7 +80,7 @@ public: virtual void drawStatus(const char *text, int16 colorPen, int16 colorBack); virtual void drawMenuBar(); virtual void clearMenuBar(); - virtual void drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo); + virtual void drawPicture(GuiResourceId pictureId, int16 animationNr, bool animationBlackoutFlag, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo); virtual void drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo); virtual void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite); virtual void drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, bool hilite); diff --git a/engines/sci/gui/gui_transitions.cpp b/engines/sci/gui/gui_transitions.cpp index 2d32581af8..bdece3e758 100644 --- a/engines/sci/gui/gui_transitions.cpp +++ b/engines/sci/gui/gui_transitions.cpp @@ -50,8 +50,9 @@ void SciGuiTransitions::init() { _oldScreen = new byte[_screen->_displayHeight * _screen->_displayWidth]; } -void SciGuiTransitions::setup(int16 number) { +void SciGuiTransitions::setup(int16 number, bool blackoutFlag) { _number = number; + _blackoutFlag = blackoutFlag; } void SciGuiTransitions::doit(Common::Rect picRect) { diff --git a/engines/sci/gui/gui_transitions.h b/engines/sci/gui/gui_transitions.h index 5d09b49cfe..5aabc22ee7 100644 --- a/engines/sci/gui/gui_transitions.h +++ b/engines/sci/gui/gui_transitions.h @@ -62,7 +62,7 @@ public: SciGuiTransitions(SciGui *gui, SciGuiScreen *screen, SciGuiPalette *palette, bool isVGA); ~SciGuiTransitions(); - void setup(int16 number); + void setup(int16 number, bool blackoutFlag); void doit(Common::Rect picRect); private: @@ -81,6 +81,7 @@ private: bool _isVGA; int16 _number; + bool _blackoutFlag; Common::Rect _picRect; byte *_oldScreen; // buffer for saving current active screen data to, has dimenions of _screen->_displayScreen }; |