Fix some of -Wnarrowing warnings

AMDmi3 · AMDmi3 · commit 22cb2696781a · 2012-12-14T23:58:00.000+04:00
diff --git a/include/GfxPrimitives.h b/include/GfxPrimitives.h
@@ -275,7 +275,7 @@ bool OneSideClip(T1& c, T2& d, const T3 clip_c, const T4 clip_d)  {
 // Create a SDL rect
 INLINE SDL_Rect MakeRect(int x, int y, int w, int h)
 {
-	SDL_Rect r = {x, y, w, h};
+	SDL_Rect r = {(Sint16)x, (Sint16)y, (Uint16)w, (Uint16)h};
 	return r;
 }
 
@@ -408,8 +408,8 @@ INLINE void DrawImageAdv(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface>
 //////////////
 // Draw the image with a huge amount of options
 INLINE void DrawImageAdv(SDL_Surface * bmpDest, SDL_Surface * bmpSrc, int sx, int sy, int dx, int dy, int w, int h) {
-	SDL_Rect r1 = { dx, dy, 0, 0 };
-	SDL_Rect r2 = { sx, sy, w, h };
+	SDL_Rect r1 = { (Sint16)dx, (Sint16)dy, 0, 0 };
+	SDL_Rect r2 = { (Sint16)sx, (Sint16)sy, (Uint16)w, (Uint16)h };
 	DrawImageAdv( bmpDest, bmpSrc, r1, r2);
 }
 INLINE void DrawImageAdv(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface> & bmpSrc, int sx, int sy, int dx, int dy, int w, int h) {
@@ -433,7 +433,7 @@ INLINE void DrawImage(SDL_Surface * bmpDest, SDL_Surface * bmpSrc, SDL_Rect& rDe
 		errors << "DrawImage: bmpSrc == NULL" << endl;
 		return;
 	}
-	SDL_Rect rSource = { 0, 0, bmpSrc->w, bmpSrc->h };
+	SDL_Rect rSource = { 0, 0, (Uint16)bmpSrc->w, (Uint16)bmpSrc->h };
 	DrawImageAdv(bmpDest, bmpSrc, rDest, rSource);
 }
 INLINE void DrawImage(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface> & bmpSrc, SDL_Rect& rDest) {
@@ -443,7 +443,7 @@ INLINE void DrawImage(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface> & b
 ///////////////
 // Simply draw the image
 INLINE void DrawImage(SDL_Surface * bmpDest, SDL_Surface * bmpSrc, int x, int y) {
-	SDL_Rect r = { x, y, 0, 0 };
+	SDL_Rect r = { (Sint16)x, (Sint16)y, 0, 0 };
 	DrawImage( bmpDest, bmpSrc, r);
 }
 INLINE void DrawImage(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface> & bmpSrc, int x, int y) {
diff --git a/include/SkinnedGUI/CGuiSkinnedLayout.h b/include/SkinnedGUI/CGuiSkinnedLayout.h
@@ -111,7 +111,7 @@ class CGuiSkinnedLayout: public CContainerWidget
 	virtual void	MoveTo( int x, int y );
 	virtual void	Resize( int x, int y, int w, int h);
 
-	SDL_Rect	getClientRect()  { SDL_Rect r = { iClientX, iClientY, iClientWidth, iClientHeight }; return r; }
+	SDL_Rect	getClientRect()  { SDL_Rect r = { (Sint16)iClientX, (Sint16)iClientY, (Uint16)iClientWidth, (Uint16)iClientHeight }; return r; }
 
 	void		incModalsRunning();
 	void		decModalsRunning();
diff --git a/include/SkinnedGUI/CWidget.h b/include/SkinnedGUI/CWidget.h
@@ -275,7 +275,7 @@ class CWidget {
 
 	WidgetType		getType()					{ return iType; }
 
-	SDL_Rect		getRect()						{ SDL_Rect r = { getX(), getY(), getWidth(), getHeight() }; return r; }
+	SDL_Rect		getRect()						{ SDL_Rect r = { (Sint16)getX(), (Sint16)getY(), (Uint16)getWidth(), (Uint16)getHeight() }; return r; }
 
 	const std::string& getName()					{ return sName; }
 	void			setName(const std::string& _n)	{ sName = _n; }
diff --git a/src/client/CClient_Draw.cpp b/src/client/CClient_Draw.cpp
@@ -2681,7 +2681,7 @@ void CClient::DrawPlayerWaitingColumn(SDL_Surface * bmpDest, int x, int y, std::
 {
 	const int h = getBottomBarTop() - y;
 
-	SDL_Rect newclip = {x, y, WAIT_COL_W, h};
+	SDL_Rect newclip = { (Sint16)x, (Sint16)y, (Uint16)WAIT_COL_W, (Uint16)h };
 	ScopedSurfaceClip clip(bmpDest, newclip);
 
 	DrawRectFill(bmpDest, x, y, x + WAIT_COL_W, y + h, tLX->clScoreBackground);
diff --git a/src/client/GfxPrimitives.cpp b/src/client/GfxPrimitives.cpp
@@ -772,7 +772,7 @@ void DrawImageAdv(SDL_Surface * bmpDest, SDL_Surface * bmpSrc, SDL_Rect& rDest,
 // Draw the image tiled on the dest surface
 void DrawImageTiled(SDL_Surface *bmpDest, SDL_Surface *bmpSrc, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh)
 {
-	SDL_Rect newClip = {dx,dy,dw,dh};
+	SDL_Rect newClip = { (Sint16)dx, (Sint16)dy, (Uint16)dw, (Uint16)dh };
 	ScopedSurfaceClip clip(bmpDest,newClip);	
 	MOD(sx, (int)bmpSrc->w); MOD(sy, (int)bmpSrc->h);
 	
@@ -1256,8 +1256,8 @@ void DrawImageResampledAdv(SDL_Surface * bmpDest, SDL_Surface * bmpSrc, int sx,
 {
 	if(!bmpSrc || !bmpDest) return;
 	
-	SDL_Rect src = { sx, sy, sw, sh };
-	SDL_Rect dst = { dx, dy, (int)((float)sw * xratio), (int)((float)sh * yratio) };
+	SDL_Rect src = { (Sint16)sx, (Sint16)sy, (Uint16)sw, (Uint16)sh };
+	SDL_Rect dst = { (Sint16)dx, (Sint16)dy, (Uint16)((float)sw * xratio), (Uint16)((float)sh * yratio) };
 	
 	// Source clipping
 	if (!ClipRefRectWith((SDLRect&)src, (SDLRect&)bmpSrc->clip_rect))
@@ -1277,8 +1277,8 @@ void DrawImageResampledAdv(SDL_Surface * bmpDest, SDL_Surface * bmpSrc, int sx,
 {
 	if(!bmpSrc || !bmpDest) return;
 
-	SDL_Rect src = { sx, sy, sw, sh };
-	SDL_Rect dst = { dx, dy, dw, dh };
+	SDL_Rect src = { (Sint16)sx, (Sint16)sy, (Uint16)sw, (Uint16)sh };
+	SDL_Rect dst = { (Sint16)dx, (Sint16)dy, (Uint16)dw, (Uint16)dh };
 	
 	// Source clipping
 	if (!ClipRefRectWith((SDLRect&)src, (SDLRect&)bmpSrc->clip_rect))
@@ -2348,7 +2348,7 @@ static void DrawRectFill_Overlay(SDL_Surface *bmpDest, const SDL_Rect& r, Color
 // Draws a filled rectangle
 void DrawRectFill(SDL_Surface *bmpDest, int x, int y, int x2, int y2, Color color)
 {
-	SDL_Rect r = { x, y, x2 - x, y2 - y };
+	SDL_Rect r = { (Sint16)x, (Sint16)y, (Uint16)(x2 - x), (Uint16)(y2 - y) };
 
 	switch (color.a)  {
 		case SDL_ALPHA_OPAQUE:
diff --git a/src/client/SkinnedGUI/CListview.cpp b/src/client/SkinnedGUI/CListview.cpp
@@ -104,7 +104,7 @@ CWidgetSubitem::~CWidgetSubitem()
 SDL_Rect CWidgetSubitem::getWidgetRect(int item_h)
 {
 	CItemStyle *style = getCurrentStyle();
-	SDL_Rect r = {style->cBorder.getLeftW(), 0, cWidget->getWidth(), cWidget->getHeight()};
+	SDL_Rect r = { (Sint16)style->cBorder.getLeftW(), 0, (Uint16)cWidget->getWidth(), (Uint16)cWidget->getHeight()};
 	switch (iVAlign)  {
 	case algTop:
 		r.y = style->cBorder.getTopW();
@@ -412,10 +412,10 @@ void CListviewColumn::Draw(SDL_Surface *bmpDest, int x, int y, int w, int h)
 	style->cBackground.Draw(bmpDest, x, y, w, h);
 
 	// Text
-	SDL_Rect r = {x + style->cBorder.getLeftW(), y + style->cBorder.getTopW(),
-		w - ((style->bmpSortArrow.get().get() && iSortDirection != sort_None) ? style->bmpSortArrow->w : 0) - 
-		style->cBorder.getLeftW() - style->cBorder.getRightW(), 
-		h -	style->cBorder.getTopW() - style->cBorder.getBottomW()};
+	SDL_Rect r = { (Sint16)(x + style->cBorder.getLeftW()), (Sint16)(y + style->cBorder.getTopW()),
+		(Uint16)(w - ((style->bmpSortArrow.get().get() && iSortDirection != sort_None) ? style->bmpSortArrow->w : 0) - 
+		style->cBorder.getLeftW() - style->cBorder.getRightW()),
+		(Uint16)(h -	style->cBorder.getTopW() - style->cBorder.getBottomW()) };
 
 	style->cText.tFontRect = &r;
 	DrawGameText(bmpDest, sText, style->cFont, style->cText);
diff --git a/src/gusanos/allegro.cpp b/src/gusanos/allegro.cpp
@@ -382,7 +382,7 @@ void rectfill(ALLEGRO_BITMAP *bmp, int x1, int y1, int x2, int y2, Uint32 color)
 	sub_to_abs_coords(bmp, x2, y2);
 	if(bmp->surf->format->BitsPerPixel == 8) {
 		// currently, DrawRectFill cannot handle 8bit and/or allegcol_to_Col is wrong
-		SDL_Rect r = { x1, y1, x2-x1, y2-y1 };
+		SDL_Rect r = { (Sint16)x1, (Sint16)y1, (Uint16)(x2-x1), (Uint16)(y2-y1) };
 		SDL_FillRect(bmp->surf.get(), &r, color);
 	}
 	else
@@ -425,8 +425,8 @@ void dumpUsedColors(SDL_Surface* surf) {
 void blit(ALLEGRO_BITMAP *source, ALLEGRO_BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height) {
 	sub_to_abs_coords(source, source_x, source_y);
 	sub_to_abs_coords(dest, dest_x, dest_y);
-	SDL_Rect srcrect = { source_x, source_y, width, height };
-	SDL_Rect dstrect = { dest_x, dest_y, width, height };
+	SDL_Rect srcrect = { (Sint16)source_x, (Sint16)source_y, (Uint16)width, (Uint16)height };
+	SDL_Rect dstrect = { (Sint16)dest_x, (Sint16)dest_y, (Uint16)width, (Uint16)height };
 	DrawImageAdv(dest->surf.get(), source->surf.get(), dstrect, srcrect);
 	// This doesn' work. We need colorkey handling:
 	// CopySurface(dest->surf.get(), source->surf.get(), source_x, source_y, dest_x, dest_y, width, height);

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ bool OneSideClip(T1& c, T2& d, const T3 clip_c, const T4 clip_d) {`
`275`	`275`	`// Create a SDL rect`
`276`	`276`	`INLINE SDL_Rect MakeRect(int x, int y, int w, int h)`
`277`	`277`	`{`
`278`		`- SDL_Rect r = {x, y, w, h};`
	`278`	`+ SDL_Rect r = {(Sint16)x, (Sint16)y, (Uint16)w, (Uint16)h};`
`279`	`279`	`return r;`
`280`	`280`	`}`
`281`	`281`
`@@ -408,8 +408,8 @@ INLINE void DrawImageAdv(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface>`
`408`	`408`	`//////////////`
`409`	`409`	`// Draw the image with a huge amount of options`
`410`	`410`	`INLINE void DrawImageAdv(SDL_Surface * bmpDest, SDL_Surface * bmpSrc, int sx, int sy, int dx, int dy, int w, int h) {`
`411`		`- SDL_Rect r1 = { dx, dy, 0, 0 };`
`412`		`- SDL_Rect r2 = { sx, sy, w, h };`
	`411`	`+ SDL_Rect r1 = { (Sint16)dx, (Sint16)dy, 0, 0 };`
	`412`	`+ SDL_Rect r2 = { (Sint16)sx, (Sint16)sy, (Uint16)w, (Uint16)h };`
`413`	`413`	`DrawImageAdv( bmpDest, bmpSrc, r1, r2);`
`414`	`414`	`}`
`415`	`415`	`INLINE void DrawImageAdv(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface> & bmpSrc, int sx, int sy, int dx, int dy, int w, int h) {`
`@@ -433,7 +433,7 @@ INLINE void DrawImage(SDL_Surface * bmpDest, SDL_Surface * bmpSrc, SDL_Rect& rDe`
`433`	`433`	`errors << "DrawImage: bmpSrc == NULL" << endl;`
`434`	`434`	`return;`
`435`	`435`	`}`
`436`		`- SDL_Rect rSource = { 0, 0, bmpSrc->w, bmpSrc->h };`
	`436`	`+ SDL_Rect rSource = { 0, 0, (Uint16)bmpSrc->w, (Uint16)bmpSrc->h };`
`437`	`437`	`DrawImageAdv(bmpDest, bmpSrc, rDest, rSource);`
`438`	`438`	`}`
`439`	`439`	`INLINE void DrawImage(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface> & bmpSrc, SDL_Rect& rDest) {`
`@@ -443,7 +443,7 @@ INLINE void DrawImage(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface> & b`
`443`	`443`	`///////////////`
`444`	`444`	`// Simply draw the image`
`445`	`445`	`INLINE void DrawImage(SDL_Surface * bmpDest, SDL_Surface * bmpSrc, int x, int y) {`
`446`		`- SDL_Rect r = { x, y, 0, 0 };`
	`446`	`+ SDL_Rect r = { (Sint16)x, (Sint16)y, 0, 0 };`
`447`	`447`	`DrawImage( bmpDest, bmpSrc, r);`
`448`	`448`	`}`
`449`	`449`	`INLINE void DrawImage(SDL_Surface * bmpDest, const SmartPointer<SDL_Surface> & bmpSrc, int x, int y) {`
Original file line number	Diff line number	Diff line change
`@@ -2681,7 +2681,7 @@ void CClient::DrawPlayerWaitingColumn(SDL_Surface * bmpDest, int x, int y, std::`
`2681`	`2681`	`{`
`2682`	`2682`	`const int h = getBottomBarTop() - y;`
`2683`	`2683`
`2684`		`- SDL_Rect newclip = {x, y, WAIT_COL_W, h};`
	`2684`	`+ SDL_Rect newclip = { (Sint16)x, (Sint16)y, (Uint16)WAIT_COL_W, (Uint16)h };`
`2685`	`2685`	`ScopedSurfaceClip clip(bmpDest, newclip);`
`2686`	`2686`
`2687`	`2687`	`DrawRectFill(bmpDest, x, y, x + WAIT_COL_W, y + h, tLX->clScoreBackground);`