DM: Fix Frame initializations

1 files changed, 47 insertions, 46 deletions

diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp
index 581e4fa343..d559fb90b6 100644
--- a/engines/dm/gfx.cpp
+++ b/engines/dm/gfx.cpp
@@ -66,37 +66,38 @@ enum StairFrameIndex {
 	kFrameStairsSide_D0R = 29 // @ G0139_s_Graphic558_Frame_StairsSide_D0R 
 };
 
-Frame gStairFrames[] = {{0, 79, 25, 70, 40, 46, 0, 0},
-{64, 159, 25, 70, 48, 46, 0, 0},
-{149, 223, 25, 70, 40, 46, 5, 0},
-{0, 63, 22, 83, 32, 62, 0, 0},
-{64, 159, 22, 83, 48, 62, 0, 0},
-{160, 223, 22, 83, 32, 62, 0, 0},
-{0, 31, 9, 108, 16, 100, 0, 0},
-{32, 191, 9, 108, 80, 100, 0, 0},
-{192, 223, 9, 108, 16, 100, 0, 0},
-{0, 31, 58, 101, 16, 44, 0, 0},
-{192, 223, 58, 101, 16, 44, 0, 0},
-{0, 79, 28, 68, 40, 41, 0, 0},
-{64, 159, 28, 70, 48, 43, 0, 0},
-{149, 223, 28, 68, 40, 41, 5, 0},
-{0, 63, 24, 85, 32, 62, 0, 0},
-{64, 159, 24, 85, 48, 62, 0, 0},
-{160, 223, 24, 85, 32, 62, 0, 0},
-{0, 31, 18, 108, 16, 91, 0, 0},
-{32, 191, 18, 108, 80, 91, 0, 0},
-{192, 223, 18, 108, 16, 91, 0, 0},
-{0, 31, 76, 135, 16, 60, 0, 0},
-{192, 223, 76, 135, 16, 60, 0, 0},
-{60, 75, 57, 61, 8, 5, 0, 0},
-{148, 163, 57, 61, 8, 5, 0, 0},
-{32, 63, 57, 99, 16, 43, 0, 0},
-{160, 191, 57, 99, 16, 43, 0, 0},
-{32, 63, 60, 98, 16, 39, 0, 0},
-{160, 191, 60, 98, 16, 39, 0, 0},
-{0, 15, 73, 85, 8, 13, 0, 0},
-{208, 223, 73, 85, 8, 13, 0, 0}};
-
+Frame gStairFrames[] = {
+	Frame(0, 79, 25, 70, 40, 46, 0, 0),
+	Frame(64, 159, 25, 70, 48, 46, 0, 0),
+	Frame(149, 223, 25, 70, 40, 46, 5, 0),
+	Frame(0, 63, 22, 83, 32, 62, 0, 0),
+	Frame(64, 159, 22, 83, 48, 62, 0, 0),
+	Frame(160, 223, 22, 83, 32, 62, 0, 0),
+	Frame(0, 31, 9, 108, 16, 100, 0, 0),
+	Frame(32, 191, 9, 108, 80, 100, 0, 0),
+	Frame(192, 223, 9, 108, 16, 100, 0, 0),
+	Frame(0, 31, 58, 101, 16, 44, 0, 0),
+	Frame(192, 223, 58, 101, 16, 44, 0, 0),
+	Frame(0, 79, 28, 68, 40, 41, 0, 0),
+	Frame(64, 159, 28, 70, 48, 43, 0, 0),
+	Frame(149, 223, 28, 68, 40, 41, 5, 0),
+	Frame(0, 63, 24, 85, 32, 62, 0, 0),
+	Frame(64, 159, 24, 85, 48, 62, 0, 0),
+	Frame(160, 223, 24, 85, 32, 62, 0, 0),
+	Frame(0, 31, 18, 108, 16, 91, 0, 0),
+	Frame(32, 191, 18, 108, 80, 91, 0, 0),
+	Frame(192, 223, 18, 108, 16, 91, 0, 0),
+	Frame(0, 31, 76, 135, 16, 60, 0, 0),
+	Frame(192, 223, 76, 135, 16, 60, 0, 0),
+	Frame(60, 75, 57, 61, 8, 5, 0, 0),
+	Frame(148, 163, 57, 61, 8, 5, 0, 0),
+	Frame(32, 63, 57, 99, 16, 43, 0, 0),
+	Frame(160, 191, 57, 99, 16, 43, 0, 0),
+	Frame(32, 63, 60, 98, 16, 39, 0, 0),
+	Frame(160, 191, 60, 98, 16, 39, 0, 0),
+	Frame(0, 15, 73, 85, 8, 13, 0, 0),
+	Frame(208, 223, 73, 85, 8, 13, 0, 0)
+};
 
 #define kFirstWallOrn 121 // @ C121_GRAPHIC_FIRST_WALL_ORNAMENT
 #define kFirstFloorSet 75 // @ C075_GRAPHIC_FIRST_FLOOR_SET
@@ -135,23 +136,23 @@ enum ViewSquare {
 Frame gCeilingFrame(0, 223, 0, 28, 112, 29, 0, 0); // @ K0012_s_Frame_Ceiling
 Frame gFloorFrame(0, 223, 66, 135, 112, 70, 0, 0); // @ K0013_s_Frame_Floor
 
-Frame gFrameWall_D3L2 = {0,  15, 25, 73, 8, 49, 0, 0}; // @ G0711_s_Graphic558_Frame_Wall_D3L2
-Frame gFrameWall_D3R2 = {208, 223, 25, 73, 8, 49, 0, 0}; // @ G0712_s_Graphic558_Frame_Wall_D3R2
+Frame gFrameWall_D3L2 = Frame(0,  15, 25, 73, 8, 49, 0, 0); // @ G0711_s_Graphic558_Frame_Wall_D3L2
+Frame gFrameWall_D3R2 = Frame(208, 223, 25, 73, 8, 49, 0, 0); // @ G0712_s_Graphic558_Frame_Wall_D3R2
 Frame gFrameWalls[12] = { // @ G0163_as_Graphic558_Frame_Walls
 	/* { X1, X2, Y1, Y2, pixelWidth, Height, X, Y } */
-	{74, 149, 25,  75,  64,  51,  18, 0},   /* D3C */
-	{0,  83, 25,  75,  64,  51,  32, 0},   /* D3L */
-	{139, 223, 25,  75,  64,  51,   0, 0},   /* D3R */
-	{60, 163, 20,  90,  72,  71,  16, 0},   /* D2C */
-	{0,  74, 20,  90,  72,  71,  61, 0},   /* D2L */
-	{149, 223, 20,  90,  72,  71,   0, 0},   /* D2R */
-	{32, 191,  9, 119, 128, 111,  48, 0},   /* D1C */
-	{0,  63,  9, 119, 128, 111, 192, 0},   /* D1L */
-	{160, 223,  9, 119, 128, 111,   0, 0},   /* D1R */
-	{0, 223,  0, 135,   0,   0,   0, 0},   /* D0C */
-	{0,  31,  0, 135,  16, 136,   0, 0},   /* D0L */
-	{192, 223,  0, 135,  16, 136,   0, 0}}; /* D0R */
-
+	Frame(74, 149, 25,  75,  64,  51,  18, 0),   /* D3C */
+	Frame(0,  83, 25,  75,  64,  51,  32, 0),   /* D3L */
+	Frame(139, 223, 25,  75,  64,  51,   0, 0),   /* D3R */
+	Frame(60, 163, 20,  90,  72,  71,  16, 0),   /* D2C */
+	Frame(0,  74, 20,  90,  72,  71,  61, 0),   /* D2L */
+	Frame(149, 223, 20,  90,  72,  71,   0, 0),   /* D2R */
+	Frame(32, 191,  9, 119, 128, 111,  48, 0),   /* D1C */
+	Frame(0,  63,  9, 119, 128, 111, 192, 0),   /* D1L */
+	Frame(160, 223,  9, 119, 128, 111,   0, 0),   /* D1R */
+	Frame(0, 223,  0, 135,   0,   0,   0, 0),   /* D0C */
+	Frame(0,  31,  0, 135,  16, 136,   0, 0),   /* D0L */
+	Frame(192, 223,  0, 135,  16, 136,   0, 0)
+}; /* D0R */
 
 enum WallSetIndices {
 	kDoorFrameFront = 0, // @  G0709_puc_Bitmap_WallSet_DoorFrameFront