[Scummvm-git-logs] scummvm master -> 449f895680682e9ab83aad9af7051987ceb6d90c

[sev-]

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:
bcc9c81174 PSP: Fix compilation
fc54286705 ANDROID: Fix compilation
449f895680 3DS: Fix compilation


Commit: bcc9c8117478bfc47a5ff63892d2172ed4e523b8
    https://github.com/scummvm/scummvm/commit/bcc9c8117478bfc47a5ff63892d2172ed4e523b8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-11T07:39:26+02:00

Commit Message:
PSP: Fix compilation

Changed paths:
    backends/platform/psp/image_viewer.h
    backends/platform/psp/powerman.h


diff --git a/backends/platform/psp/image_viewer.h b/backends/platform/psp/image_viewer.h
index 3aec580c89..1ce6ef83de 100644
--- a/backends/platform/psp/image_viewer.h
+++ b/backends/platform/psp/image_viewer.h
@@ -23,6 +23,8 @@
 #ifndef PSP_IMAGE_VIEWER_H
 #define PSP_IMAGE_VIEWER_H
 
+#include "engines/engine.h"  // for PauseToken
+
 class InputHandler;
 
 class ImageViewer : public DisplayClient {
diff --git a/backends/platform/psp/powerman.h b/backends/platform/psp/powerman.h
index de6d264533..b1fd680d6c 100644
--- a/backends/platform/psp/powerman.h
+++ b/backends/platform/psp/powerman.h
@@ -27,6 +27,8 @@
 #include "common/singleton.h"
 #include "common/list.h"
 
+#include "engines/engine.h"  // for PauseToken
+
 /*
  *  Implement this class (interface) if you want to use PowerManager's suspend callback functionality
  *


Commit: fc542867055eeaa9041c0663f0cbdc612586b8c4
    https://github.com/scummvm/scummvm/commit/fc542867055eeaa9041c0663f0cbdc612586b8c4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-11T07:41:21+02:00

Commit Message:
ANDROID: Fix compilation

Changed paths:
    backends/platform/android/jni-android.cpp


diff --git a/backends/platform/android/jni-android.cpp b/backends/platform/android/jni-android.cpp
index 95c5fe5ef5..1c7273dc47 100644
--- a/backends/platform/android/jni-android.cpp
+++ b/backends/platform/android/jni-android.cpp
@@ -690,7 +690,7 @@ void JNI::setPause(JNIEnv *env, jobject self, jboolean value) {
 		LOGD("pauseEngine: %d", value);
 
 		if (value)
-			_pauseToken = g_engine->pauseEngine(value);
+			_pauseToken = g_engine->pauseEngine();
 		else
 			_pauseToken.clear();
 


Commit: 449f895680682e9ab83aad9af7051987ceb6d90c
    https://github.com/scummvm/scummvm/commit/449f895680682e9ab83aad9af7051987ceb6d90c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-11T07:45:46+02:00

Commit Message:
3DS: Fix compilation

Changed paths:
    backends/platform/3ds/osystem-events.cpp
    backends/platform/3ds/osystem.h


diff --git a/backends/platform/3ds/osystem-events.cpp b/backends/platform/3ds/osystem-events.cpp
index 525ef15444..c0a0f3b0c0 100644
--- a/backends/platform/3ds/osystem-events.cpp
+++ b/backends/platform/3ds/osystem-events.cpp
@@ -444,11 +444,11 @@ void OSystem_3DS::runOptionsDialog() {
 
 	OptionsDialog dialog;
 	if (g_engine) {
-		g_engine->pauseEngine(true);
+		osys->_sleepPauseToken = g_engine->pauseEngine();
 	}
 	int result = dialog.runModal();
 	if (g_engine) {
-		g_engine->pauseEngine(false);
+		osys->_sleepPauseToken.clear();
 	}
 
 	if (result > 0) {
diff --git a/backends/platform/3ds/osystem.h b/backends/platform/3ds/osystem.h
index 111c3ad130..d9c9bcc113 100644
--- a/backends/platform/3ds/osystem.h
+++ b/backends/platform/3ds/osystem.h
@@ -284,6 +284,7 @@ private:
 	u16 _magWidth, _magHeight;
 	u16 _magCenterX, _magCenterY;
 
+public:
 	// Pause
 	PauseToken _sleepPauseToken;
 };