[ZH] Fixing warnings related to narrowing conversions (TheSuperHackers#534)

Author: Bart Roossien

GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h

@@ -28,14 +28,14 @@ struct BorderColor
 
 const BorderColor BORDER_COLORS[] = 
 {
-	{ "Orange",					0xFFFF8700, },
-	{ "Green",					0xFF00FF00, },
-	{ "Blue",						0xFF0000FF, },
-	{ "Cyan",						0xFF00FFFF, },
-	{ "Magenta",				0xFFFF00FF, },
-	{ "Yellow",					0xFFFFFF00, },
-	{ "Purple",					0xFF9E00FF, },
-	{ "Pink",						0xFFFF8670, },
+	{ "Orange",					0xFFFF8700L, },
+	{ "Green",					0xFF00FF00L, },
+	{ "Blue",						0xFF0000FFL, },
+	{ "Cyan",						0xFF00FFFFL, },
+	{ "Magenta",				0xFFFF00FFL, },
+	{ "Yellow",					0xFFFFFF00L, },
+	{ "Purple",					0xFF9E00FFL, },
+	{ "Pink",						0xFFFF8670L, },
 };
 
 const long BORDER_COLORS_SIZE = sizeof(BORDER_COLORS) / sizeof (BORDER_COLORS[0]);

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp

@@ -172,19 +172,19 @@ void W3DMainMenuDraw( GameWindow *window, WinInstanceData *instData )
 	IRegion2D	topHorizontal1 ={pos.x, pos.y, pos.x + size.x, pos.y	};
 	IRegion2D	topHorizontal1drop ={pos.x, pos.y+1, pos.x + size.x, pos.y+1	};
 
-	IRegion2D	topHorizontal2 ={pos.x, pos.y + (size.y * .1) , pos.x + size.x, pos.y + (size.y * .1)	};
-	IRegion2D	topHorizontal2drop ={pos.x, pos.y + (size.y * .12) , pos.x + size.x, pos.y + (size.y * .12)	};
+	IRegion2D	topHorizontal2 ={pos.x, pos.y + static_cast<int>(size.y * .1) , pos.x + size.x, pos.y + static_cast<int>(size.y * .1)	};
+	IRegion2D	topHorizontal2drop ={pos.x, pos.y + static_cast<int>(size.y * .12) , pos.x + size.x, pos.y + static_cast<int>(size.y * .12)	};
 
-	IRegion2D	bottomHorizontal1={pos.x, pos.y + (size.y * .9), pos.x + size.x, pos.y + (size.y * .9)	};
-	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + (size.y * .92), pos.x + size.x, pos.y + (size.y * .92)	};
+	IRegion2D	bottomHorizontal1={pos.x, pos.y + static_cast<int>(size.y * .9), pos.x + size.x, pos.y + static_cast<int>(size.y * .9)	};
+	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + static_cast<int>(size.y * .92), pos.x + size.x, pos.y + static_cast<int>(size.y * .92)	};
 
 	IRegion2D	bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y 	};
 	IRegion2D	bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1	};
 
-	IRegion2D	verticle1 ={pos.x + (size.x * .225), pos.y , pos.x + (size.x * .225), height 	};
-	IRegion2D	verticle2 ={pos.x + (size.x * .445), pos.y, pos.x + (size.x * .445), height 	};
-	IRegion2D	verticle3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height 	};
-	IRegion2D	verticle4 ={pos.x + (size.x * .885), pos.y , pos.x + (size.x * .885), height 	};
+	IRegion2D	verticle1 ={pos.x + static_cast<int>(size.x * .225), pos.y , pos.x + static_cast<int>(size.x * .225), height 	};
+	IRegion2D	verticle2 ={pos.x + static_cast<int>(size.x * .445), pos.y, pos.x + static_cast<int>(size.x * .445), height 	};
+	IRegion2D	verticle3 ={pos.x + static_cast<int>(size.x * .6662), pos.y, pos.x + static_cast<int>(size.x * .6662), height 	};
+	IRegion2D	verticle4 ={pos.x + static_cast<int>(size.x * .885), pos.y , pos.x + static_cast<int>(size.x * .885), height 	};
 //	static IRegion2D	verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) 	};
 //	static IRegion2D	verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) 	};
 
@@ -236,19 +236,19 @@ void W3DMainMenuFourDraw( GameWindow *window, WinInstanceData *instData )
 	IRegion2D	topHorizontal1 ={pos.x, pos.y, pos.x + size.x, pos.y	};
 	IRegion2D	topHorizontal1drop ={pos.x, pos.y+1, pos.x + size.x, pos.y+1	};
 
-	IRegion2D	topHorizontal2 ={pos.x, pos.y + (size.y * .1) , pos.x + size.x, pos.y + (size.y * .1)	};
-	IRegion2D	topHorizontal2drop ={pos.x, pos.y + (size.y * .12) , pos.x + size.x, pos.y + (size.y * .12)	};
+	IRegion2D	topHorizontal2 ={pos.x, pos.y + static_cast<int>(size.y * .1) , pos.x + size.x, pos.y + static_cast<int>(size.y * .1)	};
+	IRegion2D	topHorizontal2drop ={pos.x, pos.y + static_cast<int>(size.y * .12) , pos.x + size.x, pos.y + static_cast<int>(size.y * .12)	};
 
-	IRegion2D	bottomHorizontal1={pos.x, pos.y + (size.y * .9), pos.x + size.x, pos.y + (size.y * .9)	};
-	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + (size.y * .92), pos.x + size.x, pos.y + (size.y * .92)	};
+	IRegion2D	bottomHorizontal1={pos.x, pos.y + static_cast<int>(size.y * .9), pos.x + size.x, pos.y + static_cast<int>(size.y * .9)	};
+	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + static_cast<int>(size.y * .92), pos.x + size.x, pos.y + static_cast<int>(size.y * .92)	};
 
 	IRegion2D	bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y 	};
 	IRegion2D	bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1	};
 
-	IRegion2D	verticle1 ={pos.x + (size.x * .295), pos.y , pos.x + (size.x * .295), height 	};
-	IRegion2D	verticle2 ={pos.x + (size.x * .59), pos.y, pos.x + (size.x * .59), height 	};
+	IRegion2D	verticle1 ={pos.x + static_cast<int>(size.x * .295), pos.y , pos.x + static_cast<int>(size.x * .295), height 	};
+	IRegion2D	verticle2 ={pos.x + static_cast<int>(size.x * .59), pos.y, pos.x + static_cast<int>(size.x * .59), height 	};
 	//IRegion2D	verticle3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height 	};
-	IRegion2D	verticle4 ={pos.x + (size.x * .885), pos.y , pos.x + (size.x * .885), height 	};
+	IRegion2D	verticle4 ={pos.x + static_cast<int>(size.x * .885), pos.y , pos.x + static_cast<int>(size.x * .885), height 	};
 //	static IRegion2D	verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) 	};
 //	static IRegion2D	verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) 	};