[Scummvm-cvs-logs] scummvm master -> 00ec2a01fe58e56154f2550d63ce94aba9f05fcd
dreammaster
dreammaster at scummvm.org
Sun Aug 31 15:50:55 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
00ec2a01fe ACCESS: Fix display of advert view on Exit
Commit: 00ec2a01fe58e56154f2550d63ce94aba9f05fcd
https://github.com/scummvm/scummvm/commit/00ec2a01fe58e56154f2550d63ce94aba9f05fcd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-08-31T09:49:56-04:00
Commit Message:
ACCESS: Fix display of advert view on Exit
Changed paths:
engines/mads/nebular/menu_nebular.cpp
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 98eb669..099444f 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -44,6 +44,7 @@ MenuView::MenuView(MADSEngine *vm) : FullScreenDialog(vm) {
void MenuView::show() {
Scene &scene = _vm->_game->_scene;
EventsManager &events = *_vm->_events;
+ _vm->_screenFade = SCREEN_FADE_FAST;
display();
events.setEventTarget(this);
@@ -375,6 +376,8 @@ void AdvertView::show() {
sceneInfo->load(screenId, 0, Common::String(), 0, _vm->_game->_scene._depthSurface,
_vm->_screen);
_vm->_screen.copyRectToScreen(_vm->_screen.getBounds());
+ _vm->_palette->setFullPalette(_vm->_palette->_mainPalette);
+
delete sceneInfo;
EventsManager &events = *_vm->_events;
More information about the Scummvm-git-logs
mailing list