[Scummvm-git-logs] scummvm master -> b6dc832346ef1a70390970430f604d6b4625d268

[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:
8a27ac879e GRAPHICS: MACGUI: added initialization of engine ptr
da34d0dce2 GRAPHICS: MACGUI: moved engine ptr, pause callback to private section
b6dc832346 PINK: sync with MACGUI changes


Commit: 8a27ac879ed6241d4f1e79083e4dc431da1d2997
    https://github.com/scummvm/scummvm/commit/8a27ac879ed6241d4f1e79083e4dc431da1d2997
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-20T22:05:46+03:00

Commit Message:
GRAPHICS: MACGUI: added initialization of engine ptr

Changed paths:
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 17c0395..294983a 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -158,6 +158,7 @@ MacWindowManager::MacWindowManager() {
 	_menuDelay = 0;
 	_menuTimerActive = false;
 
+	_engine = nullptr;
 	_pauseEngineCallback = nullptr;
 
 	_colorBlack = 0;


Commit: da34d0dce2943ffb936d55bb2291d728002d0002
    https://github.com/scummvm/scummvm/commit/da34d0dce2943ffb936d55bb2291d728002d0002
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-20T22:05:46+03:00

Commit Message:
GRAPHICS: MACGUI: moved engine ptr, pause callback to private section

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


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 499f0b9..6eb9689 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -556,8 +556,8 @@ bool MacMenu::mouseMove(int x, int y) {
 			return true;
 	} else if ((_wm->_mode & kWMModeAutohideMenu) && !_bbox.contains(x, y)) {
 		_isVisible = false;
-		if ((_wm->_mode & kWMModalMenuMode) && _wm->_pauseEngineCallback) {
-			_wm->_pauseEngineCallback(_wm->_engine, false);
+		if (_wm->_mode & kWMModalMenuMode) {
+			_wm->pauseEngine(false);
 		}
 	}
 
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 294983a..5dcea4d 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -337,8 +337,8 @@ static void menuTimerHandler(void *refCon) {
 
 	if (wm->_menuHotzone.contains(wm->_lastMousePos)) {
 		wm->activateMenu();
-		if ((wm->_mode & kWMModalMenuMode) && wm->_pauseEngineCallback) {
-			wm->_pauseEngineCallback(wm->_engine, true);
+		if (wm->_mode & kWMModalMenuMode) {
+			wm->pauseEngine(true);
 		}
 	}
 
@@ -509,4 +509,15 @@ void MacWindowManager::passPalette(const byte *pal, uint size) {
 	_colorBlack = darkest;
 }
 
+void MacWindowManager::pauseEngine(bool pause) {
+	if (_engine && _pauseEngineCallback) {
+		_pauseEngineCallback(_engine, pause);
+	}
+}
+
+void MacWindowManager::setEnginePauseCallback(void *engine, void (*pauseCallback)(void *, bool)) {
+	_engine = engine;
+	_pauseEngineCallback = pauseCallback;
+}
+
 } // End of namespace Graphics
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index 1b450d9..a889816 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -209,8 +209,12 @@ public:
 	void pushWatchCursor();
 	void popCursor();
 
+	void pauseEngine(bool pause);
+
 	void setMode(uint32 mode) { _mode = mode; }
 
+	void setEnginePauseCallback(void *engine, void (*pauseCallback)(void *engine, bool pause));
+
 	void passPalette(const byte *palette, uint size);
 
 public:
@@ -224,9 +228,6 @@ public:
 
 	int _colorBlack, _colorWhite;
 
-	void *_engine;
-	void (*_pauseEngineCallback)(void *engine, bool pause);
-
 private:
 	void drawDesktop();
 
@@ -253,6 +254,9 @@ private:
 	MacMenu *_menu;
 	uint32 _menuDelay;
 
+	void *_engine;
+	void (*_pauseEngineCallback)(void *engine, bool pause);
+
 	bool _cursorIsArrow;
 };
 


Commit: b6dc832346ef1a70390970430f604d6b4625d268
    https://github.com/scummvm/scummvm/commit/b6dc832346ef1a70390970430f604d6b4625d268
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-20T22:05:46+03:00

Commit Message:
PINK: sync with MACGUI changes

Changed paths:
    engines/pink/pink.cpp


diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 71623c5..73c6f5e 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -75,8 +75,7 @@ Common::Error PinkEngine::init() {
 	_console = new Console(this);
 	_director = new Director();
 
-	_director->getWndManager()._engine = this;
-	_director->getWndManager()._pauseEngineCallback = &pauseEngine;
+	_director->getWndManager().setEnginePauseCallback(this, &pauseEngine);
 
 	Common::String orbName;
 	Common::String broName;