diff options
| author | Paul Gilbert | 2014-07-19 14:40:33 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-07-19 14:40:33 -0400 |
| commit | 23892e76cf020549e2e51fddb451e6ee0e8f324d (patch) | |
| tree | bb6467adb8ee5a589d9ac9ad65f0896e3250db3d | |
| parent | a224e28c152ce51dc33ddc8998fcdb8a274d89a5 (diff) | |
| download | scummvm-rg350-23892e76cf020549e2e51fddb451e6ee0e8f324d.tar.gz scummvm-rg350-23892e76cf020549e2e51fddb451e6ee0e8f324d.tar.bz2 scummvm-rg350-23892e76cf020549e2e51fddb451e6ee0e8f324d.zip | |
MADS: Remove redundant saved surface from FullScreenDialog base class
| -rw-r--r-- | engines/mads/nebular/dialogs_nebular.cpp | 14 | ||||
| -rw-r--r-- | engines/mads/nebular/dialogs_nebular.h | 5 | ||||
| -rw-r--r-- | engines/mads/nebular/menu_nebular.cpp | 2 |
3 files changed, 4 insertions, 17 deletions
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp index d1fc47e0e7..5a9cacddef 100644 --- a/engines/mads/nebular/dialogs_nebular.cpp +++ b/engines/mads/nebular/dialogs_nebular.cpp @@ -529,7 +529,6 @@ FullScreenDialog::FullScreenDialog(MADSEngine *vm) : _vm(vm) { } FullScreenDialog::~FullScreenDialog() { - _savedSurface.free(); } void FullScreenDialog::display() { @@ -569,19 +568,12 @@ void FullScreenDialog::display() { _vm->_screen.hLine(0, 20, MADS_SCREEN_WIDTH, 2); _vm->_screen.hLine(0, 179, MADS_SCREEN_WIDTH, 2); - game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ? kTransitionFadeIn : kCenterVertTransition; - _vm->_screen.copyTo(&_savedSurface); - /* - _vm->_screen.hLine(0, 0, MADS_SCREEN_WIDTH, 2); _vm->_screen.copyRectToScreen(Common::Rect(0, _vm->_screen._offset.y, - MADS_SCREEN_WIDTH, _vm->_screen._offset.y + 1)); + MADS_SCREEN_WIDTH, _vm->_screen._offset.y + 1)); _vm->_screen.copyRectToScreen(Common::Rect(0, _vm->_screen._offset.y + 157, - MADS_SCREEN_WIDTH, _vm->_screen._offset.y + 157)); - */ - - game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ? - kCenterVertTransition : kTransitionFadeIn; + MADS_SCREEN_WIDTH, _vm->_screen._offset.y + 157)); + game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ? kTransitionFadeIn : kCenterVertTransition; game._trigger = 0; _vm->_palette->setEntry(10, 0, 63, 0); diff --git a/engines/mads/nebular/dialogs_nebular.h b/engines/mads/nebular/dialogs_nebular.h index cf3a75a969..f4003a8a98 100644 --- a/engines/mads/nebular/dialogs_nebular.h +++ b/engines/mads/nebular/dialogs_nebular.h @@ -113,11 +113,6 @@ protected: * Engine reference */ MADSEngine *_vm; - - /** - * Used to store the original screen background - */ - MSurface _savedSurface; /** * Screen/scene to show background from diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp index 0ed7a93996..c47272624c 100644 --- a/engines/mads/nebular/menu_nebular.cpp +++ b/engines/mads/nebular/menu_nebular.cpp @@ -194,7 +194,7 @@ void MainMenu::doFrame() { // If the user has chosen to skip the menu animation, show the menu immediately if (_skipFlag && !_vm->_events->isCursorVisible()) { // Clear any pending animation - _savedSurface.copyTo(&_vm->_screen, Common::Point(0, MADS_MENU_Y)); +// _savedSurface.copyTo(&_vm->_screen, Common::Point(0, MADS_MENU_Y)); // Quickly loop through all the menuitems to display each's final frame while (_menuItemIndex < 7) { |