GNAP: Fix MSVC warnings related to the initialization of FONT_CHAR_INFO

1 files changed, 97 insertions, 95 deletions

diff --git a/engines/gnap/fontdata.h b/engines/gnap/fontdata.h
index ef39df960e..93b43b5d1a 100644
--- a/engines/gnap/fontdata.h
+++ b/engines/gnap/fontdata.h
@@ -28,6 +28,8 @@ namespace Gnap {
 struct FONT_CHAR_INFO {
   const byte _width;              // width, in bits (or pixels), of the character
   const uint16 _offset;           // offset of the character's bitmap, in bytes, into the the FONT_INFO's data array
+
+  FONT_CHAR_INFO(byte width, uint16 offset) : _width(width), _offset(offset) {}
 };
 
 /* 
@@ -747,101 +749,101 @@ const byte _dejaVuSans9ptCharBitmaps[] = {
 /* Character descriptors for DejaVu Sans 9pt */
 /* { [Char width in bits], [Offset into dejaVuSans9ptCharBitmaps in bytes] } */
 const FONT_CHAR_INFO _dejaVuSans9ptCharDescriptors[] = {
-	{5, 0}, 		/*   */
-	{1, 10}, 		/* ! */
-	{3, 12}, 		/* " */
-	{8, 18}, 		/* # */
-	{5, 34}, 		/* $ */
-	{10, 44}, 		/* % */
-	{8, 64}, 		/* & */
-	{1, 80}, 		/* ' */
-	{3, 82}, 		/* ( */
-	{3, 88}, 		/* ) */
-	{5, 94}, 		/* * */
-	{7, 104}, 		/* + */
-	{1, 118}, 		/* , */
-	{3, 120}, 		/* - */
-	{1, 126}, 		/* . */
-	{4, 128}, 		/* / */
-	{6, 136}, 		/* 0 */
-	{5, 148}, 		/* 1 */
-	{6, 158}, 		/* 2 */
-	{6, 170}, 		/* 3 */
-	{6, 182}, 		/* 4 */
-	{6, 194}, 		/* 5 */
-	{6, 206}, 		/* 6 */
-	{6, 218}, 		/* 7 */
-	{6, 230}, 		/* 8 */
-	{6, 242}, 		/* 9 */
-	{1, 254}, 		/* : */
-	{1, 256}, 		/* ; */
-	{8, 258}, 		/* < */
-	{8, 274}, 		/* = */
-	{8, 290}, 		/* > */
-	{5, 306}, 		/* ? */
-	{11, 316}, 		/* @ */
-	{8, 338}, 		/* A */
-	{6, 354}, 		/* B */
-	{6, 366}, 		/* C */
-	{7, 378}, 		/* D */
-	{6, 392}, 		/* E */
-	{5, 404}, 		/* F */
-	{7, 414}, 		/* G */
-	{7, 428}, 		/* H */
-	{1, 442}, 		/* I */
-	{3, 444}, 		/* J */
-	{6, 450}, 		/* K */
-	{5, 462}, 		/* L */
-	{8, 472}, 		/* M */
-	{7, 488}, 		/* N */
-	{7, 502}, 		/* O */
-	{6, 516}, 		/* P */
-	{7, 528}, 		/* Q */
-	{7, 542}, 		/* R */
-	{6, 556}, 		/* S */
-	{7, 568}, 		/* T */
-	{7, 582}, 		/* U */
-	{8, 596}, 		/* V */
-	{11, 612}, 		/* W */
-	{7, 634}, 		/* X */
-	{7, 648}, 		/* Y */
-	{7, 662}, 		/* Z */
-	{2, 676}, 		/* [ */
-	{4, 680}, 		/* \ */
-	{2, 688}, 		/* ] */
-	{6, 692}, 		/* ^ */
-	{6, 704}, 		/* _ */
-	{2, 716}, 		/* ` */
-	{6, 720}, 		/* a */
-	{6, 732}, 		/* b */
-	{5, 744}, 		/* c */
-	{6, 754}, 		/* d */
-	{6, 766}, 		/* e */
-	{4, 778}, 		/* f */
-	{6, 786}, 		/* g */
-	{6, 798}, 		/* h */
-	{1, 810}, 		/* i */
-	{2, 812}, 		/* j */
-	{5, 816}, 		/* k */
-	{1, 826}, 		/* l */
-	{9, 828}, 		/* m */
-	{6, 846}, 		/* n */
-	{6, 858}, 		/* o */
-	{6, 870}, 		/* p */
-	{6, 882}, 		/* q */
-	{4, 894}, 		/* r */
-	{5, 902}, 		/* s */
-	{4, 912}, 		/* t */
-	{6, 920}, 		/* u */
-	{6, 932}, 		/* v */
-	{9, 944}, 		/* w */
-	{6, 962}, 		/* x */
-	{6, 974}, 		/* y */
-	{5, 986}, 		/* z */
-	{5, 996}, 		/* { */
-	{1, 1006}, 		/* | */
-	{5, 1008}, 		/* } */
-	{8, 1018}, 		/* ~ */
+	FONT_CHAR_INFO(5, 0), 		/*   */
+	FONT_CHAR_INFO(1, 10), 		/* ! */
+	FONT_CHAR_INFO(3, 12), 		/* " */
+	FONT_CHAR_INFO(8, 18), 		/* # */
+	FONT_CHAR_INFO(5, 34), 		/* $ */
+	FONT_CHAR_INFO(10, 44), 		/* % */
+	FONT_CHAR_INFO(8, 64), 		/* & */
+	FONT_CHAR_INFO(1, 80), 		/* ' */
+	FONT_CHAR_INFO(3, 82), 		/* ( */
+	FONT_CHAR_INFO(3, 88), 		/* ) */
+	FONT_CHAR_INFO(5, 94), 		/* * */
+	FONT_CHAR_INFO(7, 104), 		/* + */
+	FONT_CHAR_INFO(1, 118), 		/* , */
+	FONT_CHAR_INFO(3, 120), 		/* - */
+	FONT_CHAR_INFO(1, 126), 		/* . */
+	FONT_CHAR_INFO(4, 128), 		/* / */
+	FONT_CHAR_INFO(6, 136), 		/* 0 */
+	FONT_CHAR_INFO(5, 148), 		/* 1 */
+	FONT_CHAR_INFO(6, 158), 		/* 2 */
+	FONT_CHAR_INFO(6, 170), 		/* 3 */
+	FONT_CHAR_INFO(6, 182), 		/* 4 */
+	FONT_CHAR_INFO(6, 194), 		/* 5 */
+	FONT_CHAR_INFO(6, 206), 		/* 6 */
+	FONT_CHAR_INFO(6, 218), 		/* 7 */
+	FONT_CHAR_INFO(6, 230), 		/* 8 */
+	FONT_CHAR_INFO(6, 242), 		/* 9 */
+	FONT_CHAR_INFO(1, 254), 		/* : */
+	FONT_CHAR_INFO(1, 256), 		/* ; */
+	FONT_CHAR_INFO(8, 258), 		/* < */
+	FONT_CHAR_INFO(8, 274), 		/* = */
+	FONT_CHAR_INFO(8, 290), 		/* > */
+	FONT_CHAR_INFO(5, 306), 		/* ? */
+	FONT_CHAR_INFO(11, 316), 		/* @ */
+	FONT_CHAR_INFO(8, 338), 		/* A */
+	FONT_CHAR_INFO(6, 354), 		/* B */
+	FONT_CHAR_INFO(6, 366), 		/* C */
+	FONT_CHAR_INFO(7, 378), 		/* D */
+	FONT_CHAR_INFO(6, 392), 		/* E */
+	FONT_CHAR_INFO(5, 404), 		/* F */
+	FONT_CHAR_INFO(7, 414), 		/* G */
+	FONT_CHAR_INFO(7, 428), 		/* H */
+	FONT_CHAR_INFO(1, 442), 		/* I */
+	FONT_CHAR_INFO(3, 444), 		/* J */
+	FONT_CHAR_INFO(6, 450), 		/* K */
+	FONT_CHAR_INFO(5, 462), 		/* L */
+	FONT_CHAR_INFO(8, 472), 		/* M */
+	FONT_CHAR_INFO(7, 488), 		/* N */
+	FONT_CHAR_INFO(7, 502), 		/* O */
+	FONT_CHAR_INFO(6, 516), 		/* P */
+	FONT_CHAR_INFO(7, 528), 		/* Q */
+	FONT_CHAR_INFO(7, 542), 		/* R */
+	FONT_CHAR_INFO(6, 556), 		/* S */
+	FONT_CHAR_INFO(7, 568), 		/* T */
+	FONT_CHAR_INFO(7, 582), 		/* U */
+	FONT_CHAR_INFO(8, 596), 		/* V */
+	FONT_CHAR_INFO(11, 612), 		/* W */
+	FONT_CHAR_INFO(7, 634), 		/* X */
+	FONT_CHAR_INFO(7, 648), 		/* Y */
+	FONT_CHAR_INFO(7, 662), 		/* Z */
+	FONT_CHAR_INFO(2, 676), 		/* [ */
+	FONT_CHAR_INFO(4, 680), 		/* \ */
+	FONT_CHAR_INFO(2, 688), 		/* ] */
+	FONT_CHAR_INFO(6, 692), 		/* ^ */
+	FONT_CHAR_INFO(6, 704), 		/* _ */
+	FONT_CHAR_INFO(2, 716), 		/* ` */
+	FONT_CHAR_INFO(6, 720), 		/* a */
+	FONT_CHAR_INFO(6, 732), 		/* b */
+	FONT_CHAR_INFO(5, 744), 		/* c */
+	FONT_CHAR_INFO(6, 754), 		/* d */
+	FONT_CHAR_INFO(6, 766), 		/* e */
+	FONT_CHAR_INFO(4, 778), 		/* f */
+	FONT_CHAR_INFO(6, 786), 		/* g */
+	FONT_CHAR_INFO(6, 798), 		/* h */
+	FONT_CHAR_INFO(1, 810), 		/* i */
+	FONT_CHAR_INFO(2, 812), 		/* j */
+	FONT_CHAR_INFO(5, 816), 		/* k */
+	FONT_CHAR_INFO(1, 826), 		/* l */
+	FONT_CHAR_INFO(9, 828), 		/* m */
+	FONT_CHAR_INFO(6, 846), 		/* n */
+	FONT_CHAR_INFO(6, 858), 		/* o */
+	FONT_CHAR_INFO(6, 870), 		/* p */
+	FONT_CHAR_INFO(6, 882), 		/* q */
+	FONT_CHAR_INFO(4, 894), 		/* r */
+	FONT_CHAR_INFO(5, 902), 		/* s */
+	FONT_CHAR_INFO(4, 912), 		/* t */
+	FONT_CHAR_INFO(6, 920), 		/* u */
+	FONT_CHAR_INFO(6, 932), 		/* v */
+	FONT_CHAR_INFO(9, 944), 		/* w */
+	FONT_CHAR_INFO(6, 962), 		/* x */
+	FONT_CHAR_INFO(6, 974), 		/* y */
+	FONT_CHAR_INFO(5, 986), 		/* z */
+	FONT_CHAR_INFO(5, 996), 		/* { */
+	FONT_CHAR_INFO(1, 1006), 		/* | */
+	FONT_CHAR_INFO(5, 1008), 		/* ) */
+	FONT_CHAR_INFO(8, 1018) 		/* ~ */
 };
 
 } // End of namespace Gnap