[Scummvm-git-logs] scummvm master -> 0b68bfa7739eb408161915b6c2dde84a5f57075f

[digitall]

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

Summary:
0b68bfa773 SAGA2: Fix for Non-Scaler Initializer Build Failures


Commit: 0b68bfa7739eb408161915b6c2dde84a5f57075f
    https://github.com/scummvm/scummvm/commit/0b68bfa7739eb408161915b6c2dde84a5f57075f
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-01T06:36:35+01:00

Commit Message:
SAGA2: Fix for Non-Scaler Initializer Build Failures

Changed paths:
    engines/saga2/contain.cpp


diff --git a/engines/saga2/contain.cpp b/engines/saga2/contain.cpp
index 480954334c..4af1a574cf 100644
--- a/engines/saga2/contain.cpp
+++ b/engines/saga2/contain.cpp
@@ -115,16 +115,16 @@ ContainerList       globalContainerList;
 //	Physical container appearance
 
 static ContainerAppearanceDef physicalContainerAppearance = {
-	{250, 60, 268, 304 + 16},
-	{17 + 4, 87, 268 - 2, 304 - 87},
-	{13 + 8, 37, 44, 42},
-	{13 + 8 + 44, 37, 44, 42},
-	{13 + 118, 50, 36, 36},
-	{13 + 139, 37, 88, 43},
+	Rect16(250, 60, 268, 304 + 16),
+	Rect16(17 + 4, 87, 268 - 2, 304 - 87),
+	Rect16(13 + 8, 37, 44, 42),
+	Rect16(13 + 8 + 44, 37, 44, 42),
+	Rect16(13 + 118, 50, 36, 36),
+	Rect16(13 + 139, 37, 88, 43),
 	{ MKTAG('P', 'C', 'L', 0), MKTAG('P', 'C', 'L', 1) },
 	{ MKTAG('P', 'S', 'L', 0), MKTAG('P', 'S', 'L', 1) },
-	{13, 8},
-	{22, 22},
+	Point16(13, 8),
+	Point16(22, 22),
 	0, 0,
 	0
 };
@@ -157,16 +157,16 @@ static StaticWindow woodDecorations[] = {
 //	Death container appearance
 
 ContainerAppearanceDef  deathContainerAppearance = {
-	{260, 60, 206, 250},
-	{2, 87, 206 - 22, 250 - 87 - 32},
-	{16,  24, 44, 42},
-	{120 + 18, 24, 44, 42},
-	{0, 0, 0, 0},
-	{0, 0, 0, 0},
+	Rect16(260, 60, 206, 250),
+	Rect16(2, 87, 206 - 22, 250 - 87 - 32),
+	Rect16(16,  24, 44, 42),
+	Rect16(120 + 18, 24, 44, 42),
+	Rect16(0, 0, 0, 0),
+	Rect16(0, 0, 0, 0),
 	{ MKTAG('D', 'C', 'L', 0), MKTAG('D', 'C', 'L', 1) },
 	{ MKTAG('D', 'S', 'L', 0), MKTAG('D', 'S', 'L', 1) },
-	{27, -4},
-	{22, 22},
+	Point16(27, -4),
+	Point16(22, 22),
 	0, 0,
 	0
 };
@@ -180,16 +180,16 @@ static StaticWindow deathDecorations[] = {
 //	ReadyContainer appearance
 
 ContainerAppearanceDef  readyContainerAppearance = {
-	{0, 0, 0, 0},
-	{476, 105, 0, 0},
-	{0, 0, 0, 0},
-	{0, 0, 0, 0},
-	{0, 0, 0, 0},
-	{0, 0, 0, 0},
+	Rect16(0, 0, 0, 0),
+	Rect16(476, 105, 0, 0),
+	Rect16(0, 0, 0, 0),
+	Rect16(0, 0, 0, 0),
+	Rect16(0, 0, 0, 0),
+	Rect16(0, 0, 0, 0),
 	{ 0, 0 },
 	{ 0, 0 },
-	{iconOriginX - 1, iconOriginY - 1 - 8},
-	{iconSpacingX, iconSpacingY},
+	Point16(iconOriginX - 1, iconOriginY - 1 - 8),
+	Point16(iconSpacingX, iconSpacingY),
 	1, 3,
 	3
 };
@@ -198,16 +198,16 @@ ContainerAppearanceDef  readyContainerAppearance = {
 //	Mental Container appearance
 
 ContainerAppearanceDef  mentalContainerAppearance = {
-	{478, 168 - 54, 158, 215},
-	{2, 86 - 18 - 4, 158 - 2, 215 - 66},
-	{2, 19, 44, 44},
-	{103, 40 - 18 - 4, 44, 44},
-	{0, 0, 0, 0},
-	{0, 0, 0, 0},
+	Rect16(478, 168 - 54, 158, 215),
+	Rect16(2, 86 - 18 - 4, 158 - 2, 215 - 66),
+	Rect16(2, 19, 44, 44),
+	Rect16(103, 40 - 18 - 4, 44, 44),
+	Rect16(0, 0, 0, 0),
+	Rect16(0, 0, 0, 0),
 	{ MKTAG('C', 'L', 'S', 0), MKTAG('C', 'L', 'S', 1) },
 	{ MKTAG('S', 'E', 'L', 0), MKTAG('S', 'E', 'L', 1) },
-	{3, 0},
-	{4, 4},
+	Point16(3, 0),
+	Point16(4, 4),
 	4, 4,
 	20
 };
@@ -219,16 +219,16 @@ static StaticWindow mentalDecorations[] = {
 //	Enchantment container appearance
 
 ContainerAppearanceDef  enchantmentContainerAppearance = {
-	{262, 92, 116, 202},
-	{2, 87, 116 - 2, 202 - 87},
-	{7, 50, 44, 43},
-	{57, 50, 44, 43},
-	{38, 7, 32, 32},
-	{0, 0, 0, 0},
+	Rect16(262, 92, 116, 202),
+	Rect16(2, 87, 116 - 2, 202 - 87),
+	Rect16(7, 50, 44, 43),
+	Rect16(57, 50, 44, 43),
+	Rect16(38, 7, 32, 32),
+	Rect16(0, 0, 0, 0),
 	{ MKTAG('A', 'A', 'A', 0), MKTAG('A', 'A', 'A', 0) },
 	{ MKTAG('A', 'A', 'A', 0), MKTAG('A', 'A', 'A', 0) },
-	{12, 98},
-	{16, 13},
+	Point16(12, 98),
+	Point16(16, 13),
 	2, 2,
 	2
 };