[Scummvm-git-logs] scummvm branch-2-1 -> 53ed082377a9b38abf89543ef1504907f76b1161

[ccawley2011]

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

Summary:
4364a9fe8d LINUXMOTO: Fix Compilation
53ed082377 3DS: Fix compilation


Commit: 4364a9fe8dc4f74accaafec74b3dbac42ab79212
    https://github.com/scummvm/scummvm/commit/4364a9fe8dc4f74accaafec74b3dbac42ab79212
Author: D G Turner (digitall at scummvm.org)
Date: 2020-01-11T22:54:33Z

Commit Message:
LINUXMOTO: Fix Compilation

Changed paths:
    backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp


diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
index 7aab924..ed04d21 100644
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
+++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
@@ -262,7 +262,7 @@ void LinuxmotoSdlGraphicsManager::internUpdateScreen() {
 
 		_currentShakeXOffset = _gameScreenShakeXOffset;
 
-		_forceFull = true;
+		_forceRedraw = true;
 	}
 	if (_currentShakeYOffset != _gameScreenShakeYOffset ||
 		(_cursorNeedsRedraw && _mouseBackup.y <= _currentShakeYOffset)) {


Commit: 53ed082377a9b38abf89543ef1504907f76b1161
    https://github.com/scummvm/scummvm/commit/53ed082377a9b38abf89543ef1504907f76b1161
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-01-11T22:55:20Z

Commit Message:
3DS: Fix compilation

Changed paths:
    backends/platform/3ds/sprite.cpp


diff --git a/backends/platform/3ds/sprite.cpp b/backends/platform/3ds/sprite.cpp
index 74805b4..1b43837 100644
--- a/backends/platform/3ds/sprite.cpp
+++ b/backends/platform/3ds/sprite.cpp
@@ -51,8 +51,8 @@ void Sprite::create(uint16 width, uint16 height, const Graphics::PixelFormat &f)
 	actualWidth = width;
 	actualHeight = height;
 	format = f;
-	w = MAX(Common::nextHigher2(width), 64u);
-	h = MAX(Common::nextHigher2(height), 64u);
+	w = MAX<uint16>(Common::nextHigher2(width), 64u);
+	h = MAX<uint16>(Common::nextHigher2(height), 64u);
 	pitch = w * format.bytesPerPixel;
 	dirtyPixels = true;