[Scummvm-git-logs] scummvm master -> 877b4e5cf3bd9c40cb1177a2f5a1cc452d3fcebf

[whiterandrek]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cdd5717ce0 PINK: fixed entering pda through menu in a row
f447ccb390 GRAPHICS: MACGUI: fixed restoring screen
877b4e5cf3 PINK: fixed engine destroying in pda state


Commit: cdd5717ce0ed596936d818036264684e3503aab2
    https://github.com/scummvm/scummvm/commit/cdd5717ce0ed596936d818036264684e3503aab2
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-26T05:10:57+03:00

Commit Message:
PINK: fixed entering pda through menu in a row

Changed paths:
    engines/pink/objects/actors/lead_actor.cpp


diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index b5fd047..dc36ffc 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -162,8 +162,8 @@ void LeadActor::loadPDA(const Common::String &pageName) {
 
 		_stateBeforePDA = _state;
 		_state = kPDA;
+		_page->getGame()->getDirector()->saveStage();
 	}
-	_page->getGame()->getDirector()->saveStage();
 	_page->getGame()->getPdaMgr().setLead(this);
 	_page->getGame()->getPdaMgr().goToPage(pageName);
 }


Commit: f447ccb3907a03e1f4a2147c4b10e75311d3dd4a
    https://github.com/scummvm/scummvm/commit/f447ccb3907a03e1f4a2147c4b10e75311d3dd4a
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-26T05:18:04+03:00

Commit Message:
GRAPHICS: MACGUI: fixed restoring screen

Changed paths:
    graphics/macgui/macmenu.cpp
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index b50c583..ac64f0c 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -674,7 +674,7 @@ bool MacMenu::mouseMove(int x, int y) {
 		_isVisible = false;
 		if (_wm->_mode & kWMModalMenuMode) {
 			_wm->pauseEngine(false);
-			_wm->_screen = _wm->_screenCopy; // restore screen
+			*_wm->_screen = *_wm->_screenCopy; // restore screen
 			g_system->copyRectToScreen(_wm->_screenCopy->getBasePtr(0, 0), _wm->_screenCopy->pitch, 0, 0, _wm->_screenCopy->w, _wm->_screenCopy->h);
 		}
 	}
@@ -689,7 +689,7 @@ bool MacMenu::mouseRelease(int x, int y) {
 
 		if (_wm->_mode & kWMModalMenuMode) {
 			_wm->pauseEngine(false);
-			_wm->_screen = _wm->_screenCopy; // restore screen
+			*_wm->_screen = *_wm->_screenCopy; // restore screen
 			g_system->copyRectToScreen(_wm->_screenCopy->getBasePtr(0, 0), _wm->_screenCopy->pitch, 0, 0, _wm->_screenCopy->w, _wm->_screenCopy->h);
 		}
 
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 737f908..e37332c 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -341,7 +341,10 @@ static void menuTimerHandler(void *refCon) {
 	if (wm->_menuHotzone.contains(wm->_lastMousePos)) {
 		wm->activateMenu();
 		if (wm->_mode & kWMModalMenuMode) {
-			wm->_screenCopy = new ManagedSurface(*wm->_screen);	// Create a copy
+			if (!wm->_screenCopy)
+				wm->_screenCopy = new ManagedSurface(*wm->_screen);	// Create a copy
+			else
+				*wm->_screenCopy = *wm->_screen;
 			wm->pauseEngine(true);
 		}
 	}


Commit: 877b4e5cf3bd9c40cb1177a2f5a1cc452d3fcebf
    https://github.com/scummvm/scummvm/commit/877b4e5cf3bd9c40cb1177a2f5a1cc452d3fcebf
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-26T05:24:57+03:00

Commit Message:
PINK: fixed engine destroying in pda state

Changed paths:
    engines/pink/pink.cpp


diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index fd5756c..699f2cc 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -56,6 +56,7 @@ PinkEngine::PinkEngine(OSystem *system, const ADGameDescription *desc)
 PinkEngine::~PinkEngine() {
 	delete _console;
 	delete _bro;
+	_pdaMgr.close();
 	for (uint i = 0; i < _modules.size(); ++i) {
 		delete _modules[i];
 	}