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

[lephilousophe]

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:
3e406ed5af COMMON: Fix nullptr_t usage
fe26ec3b81 TINSEL: Fix int vs int32 discrepancies


Commit: 3e406ed5afda11c2324c90c3ee9a40a80ceb5b1a
    https://github.com/scummvm/scummvm/commit/3e406ed5afda11c2324c90c3ee9a40a80ceb5b1a
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-05-08T10:27:59+02:00

Commit Message:
COMMON: Fix nullptr_t usage

Changed paths:
    common/ptr.h


diff --git a/common/ptr.h b/common/ptr.h
index 77f694db29a..4d2590d1516 100644
--- a/common/ptr.h
+++ b/common/ptr.h
@@ -560,7 +560,7 @@ public:
 	typedef T &ReferenceType;
 
 	explicit ScopedPtr(PointerType o = nullptr) : _pointer(o) {}
-	ScopedPtr(nullptr_t) : _pointer(nullptr) {}
+	ScopedPtr(std::nullptr_t) : _pointer(nullptr) {}
 
 	ReferenceType operator*() const { return *_pointer; }
 	PointerType operator->() const { return _pointer; }
@@ -586,7 +586,7 @@ public:
 	/**
 	 * Affectation with nullptr
 	 */
-	ScopedPtr &operator=(nullptr_t) {
+	ScopedPtr &operator=(std::nullptr_t) {
 		reset(nullptr);
 	}
 


Commit: fe26ec3b81d526b7fce400d9636db6da1bd160e2
    https://github.com/scummvm/scummvm/commit/fe26ec3b81d526b7fce400d9636db6da1bd160e2
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-05-08T10:32:09+02:00

Commit Message:
TINSEL: Fix int vs int32 discrepancies

Changed paths:
    engines/tinsel/palette.cpp
    engines/tinsel/palette.h


diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp
index 4d236282581..1b0cc90f0b0 100644
--- a/engines/tinsel/palette.cpp
+++ b/engines/tinsel/palette.cpp
@@ -637,7 +637,7 @@ void DimPartPalette(SCNHANDLE hDimPal, int startColor, int length, int brightnes
 	}
 }
 
-int32 DarkGreen() {
+int DarkGreen() {
 	return _vm->screen().format.RGBToColor(0x00, 0x40, 0x00);
 }
 
diff --git a/engines/tinsel/palette.h b/engines/tinsel/palette.h
index 29d7b1cc75b..fcff0fe8eff 100644
--- a/engines/tinsel/palette.h
+++ b/engines/tinsel/palette.h
@@ -144,7 +144,7 @@ void DimPartPalette(
 
 
 int TranslucentColor();
-int32 DarkGreen();
+int DarkGreen();
 
 #define BoxColor (TinselVersion == 3 ? DarkGreen : TranslucentColor)