mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Remove unnecessary Sint16 casts

Browse source 
These casts are sprinkled all throughout the graphics code when creating
and initializing an SDL_Rect on the same line. Unfortunately, most of
these are unnecessary, and at worst are wasteful because they result in
narrowing a 4-byte integer into a 2-byte one when they don't need to
(SDL_Rects are made up of 4-byte integers).

Now, removing them reveals why they were placed there in the first place
- a warning is raised (-Wnarrowing) that implicit narrowing conversions
are prohibited in initializer lists in C++11. (Notably, if the
conversion wasn't narrowing, or implicit, or done in an initializer
list, it would be fine. This is a really specific prohibition that
doesn't apply if any of its sub-cases are true.)

We don't use C++11, but this warning can be easily vanquished by a
simple explicit cast to int (similar to the error of implicitly
converting void* to any other pointer in C++, which works just fine in
C), and we only need to do it when the warning is raised (not every
single time we make an SDL_Rect), so there we go.
This commit is contained in:
Misa 2021-04-18 11:13:12 -07:00 committed by Ethan Lee
parent 15b085b326
commit b02cf00ce6
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
desktop_version/src/Graphics.cpp
View file

@ -45,7 +45,7 @@ void Graphics::init(void)
//Background inits //Background inits
for (int i = 0; i < numstars; i++) for (int i = 0; i < numstars; i++)
{ {
SDL_Rect s = {Sint16(fRandom() * 320), Sint16(fRandom() * 240), 2, 2}; SDL_Rect s = {(int) (fRandom() * 320), (int) (fRandom() * 240), 2, 2};
int s2 = 4+(fRandom()*4); int s2 = 4+(fRandom()*4);
stars[i] = s; stars[i] = s;
starsspeed[i] = s2; starsspeed[i] = s2;
@ -532,7 +532,7 @@ void Graphics::bigprint( int _x, int _y, std::string _s, int r, int g, int b, b
if (INBOUNDS_VEC(idx, font)) if (INBOUNDS_VEC(idx, font))
{ {
SDL_Surface* tempPrint = ScaleSurface(font[idx], font[idx]->w *sc,font[idx]->h *sc); SDL_Surface* tempPrint = ScaleSurface(font[idx], font[idx]->w *sc,font[idx]->h *sc);
SDL_Rect printrect = { static_cast<Sint16>((_x) + bfontpos), static_cast<Sint16>(_y) , static_cast<Sint16>((bfont_rect.w*sc)+1), static_cast<Sint16>((bfont_rect.h * sc)+1)}; SDL_Rect printrect = {_x + bfontpos, _y, bfont_rect.w*sc + 1, bfont_rect.h*sc + 1};
BlitSurfaceColoured(tempPrint, NULL, backBuffer, &printrect, ct); BlitSurfaceColoured(tempPrint, NULL, backBuffer, &printrect, ct);
SDL_FreeSurface(tempPrint); SDL_FreeSurface(tempPrint);
} }
@ -718,7 +718,7 @@ void Graphics::drawsprite( int x, int y, int t, int r, int g, int b )
WHINE_ONCE("drawsprite() out-of-bounds!"); WHINE_ONCE("drawsprite() out-of-bounds!");
} }
SDL_Rect rect = { Sint16(x), Sint16(y), sprites_rect.w, sprites_rect.h }; SDL_Rect rect = {x, y, sprites_rect.w, sprites_rect.h};
setcolreal(getRGB(r,g,b)); setcolreal(getRGB(r,g,b));
BlitSurfaceColoured(sprites[t], NULL, backBuffer, &rect, ct); BlitSurfaceColoured(sprites[t], NULL, backBuffer, &rect, ct);
} }
@ -730,7 +730,7 @@ void Graphics::drawsprite(int x, int y, int t, Uint32 c)
WHINE_ONCE("drawsprite() out-of-bounds!"); WHINE_ONCE("drawsprite() out-of-bounds!");
} }
SDL_Rect rect = { Sint16(x), Sint16(y), sprites_rect.w, sprites_rect.h }; SDL_Rect rect = {x, y, sprites_rect.w, sprites_rect.h};
setcolreal(c); setcolreal(c);
BlitSurfaceColoured(sprites[t], NULL, backBuffer, &rect, ct); BlitSurfaceColoured(sprites[t], NULL, backBuffer, &rect, ct);
} }
@ -752,7 +752,7 @@ void Graphics::drawtile( int x, int y, int t )
return; return;
} }
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h }; SDL_Rect rect = {x, y, tiles_rect.w, tiles_rect.h};
#if !defined(NO_CUSTOM_LEVELS) #if !defined(NO_CUSTOM_LEVELS)
if (shouldrecoloroneway(t, tiles1_mounted)) if (shouldrecoloroneway(t, tiles1_mounted))
@ -776,7 +776,7 @@ void Graphics::drawtile2( int x, int y, int t )
return; return;
} }
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h }; SDL_Rect rect = {x, y, tiles_rect.w, tiles_rect.h};
#if !defined(NO_CUSTOM_LEVELS) #if !defined(NO_CUSTOM_LEVELS)
if (shouldrecoloroneway(t, tiles2_mounted)) if (shouldrecoloroneway(t, tiles2_mounted))
@ -802,7 +802,7 @@ void Graphics::drawtile3( int x, int y, int t, int off, int height_subtract /*=
return; return;
} }
SDL_Rect src_rect = { 0, 0, tiles_rect.w, tiles_rect.h - height_subtract }; SDL_Rect src_rect = { 0, 0, tiles_rect.w, tiles_rect.h - height_subtract };
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h }; SDL_Rect rect = {x, y, tiles_rect.w, tiles_rect.h};
BlitSurfaceStandard(tiles3[t], &src_rect, backBuffer, &rect); BlitSurfaceStandard(tiles3[t], &src_rect, backBuffer, &rect);
} }
@ -815,7 +815,7 @@ void Graphics::drawtowertile( int x, int y, int t )
} }
x += 8; x += 8;
y += 8; y += 8;
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h }; SDL_Rect rect = {x, y, tiles_rect.w, tiles_rect.h};
BlitSurfaceStandard(tiles2[t], NULL, warpbuffer, &rect); BlitSurfaceStandard(tiles2[t], NULL, warpbuffer, &rect);
} }
@ -830,7 +830,7 @@ void Graphics::drawtowertile3( int x, int y, int t, TowerBG& bg_obj )
} }
x += 8; x += 8;
y += 8; y += 8;
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h }; SDL_Rect rect = {x, y, tiles_rect.w, tiles_rect.h};
BlitSurfaceStandard(tiles3[t], NULL, bg_obj.buffer, &rect); BlitSurfaceStandard(tiles3[t], NULL, bg_obj.buffer, &rect);
} }
@ -2063,7 +2063,7 @@ void Graphics::drawentity(const int i, const int yoff)
tpoint.x = xp; tpoint.y = yp - yoff; tpoint.x = xp; tpoint.y = yp - yoff;
setcolreal(obj.entities[i].realcol); setcolreal(obj.entities[i].realcol);
setRect(drawRect, Sint16(xp), Sint16(yp - yoff), Sint16(sprites_rect.x * 6), Sint16(sprites_rect.y * 6 ) ); setRect(drawRect, xp, yp - yoff, sprites_rect.x * 6, sprites_rect.y * 6);
SDL_Surface* TempSurface = ScaleSurface( spritesvec[obj.entities[i].drawframe], 6 * sprites_rect.w,6* sprites_rect.h ); SDL_Surface* TempSurface = ScaleSurface( spritesvec[obj.entities[i].drawframe], 6 * sprites_rect.w,6* sprites_rect.h );
BlitSurfaceColoured(TempSurface, NULL , backBuffer, &drawRect, ct ); BlitSurfaceColoured(TempSurface, NULL , backBuffer, &drawRect, ct );
SDL_FreeSurface(TempSurface); SDL_FreeSurface(TempSurface);
@ -2381,7 +2381,7 @@ void Graphics::updatebackground(int t)
{ {
stars[i].w = 2; stars[i].w = 2;
stars[i].h = 2; stars[i].h = 2;
stars[i].x -= Sint16(starsspeed[i]); stars[i].x -= starsspeed[i];
if (stars[i].x < -10) if (stars[i].x < -10)
{ {
stars[i].x += 340; stars[i].x += 340;
@ -3168,7 +3168,7 @@ void Graphics::bigrprint(int x, int y, std::string& t, int r, int g, int b, bool
if (INBOUNDS_VEC(idx, font)) if (INBOUNDS_VEC(idx, font))
{ {
SDL_Surface* tempPrint = ScaleSurface(font[idx], font[idx]->w *sc,font[idx]->h *sc); SDL_Surface* tempPrint = ScaleSurface(font[idx], font[idx]->w *sc,font[idx]->h *sc);
SDL_Rect printrect = { Sint16((x) + bfontpos), Sint16(y) , Sint16(bfont_rect.w*sc), Sint16(bfont_rect.h * sc)}; SDL_Rect printrect = {x + bfontpos, y, (int) (bfont_rect.w * sc), (int) (bfont_rect.h * sc)};
BlitSurfaceColoured(tempPrint, NULL, backBuffer, &printrect, ct); BlitSurfaceColoured(tempPrint, NULL, backBuffer, &printrect, ct);
SDL_FreeSurface(tempPrint); SDL_FreeSurface(tempPrint);
} }

4
desktop_version/src/GraphicsUtil.cpp
View file

@ -382,7 +382,7 @@ SDL_Surface* ApplyFilter( SDL_Surface* _src )
void FillRect( SDL_Surface* _surface, const int _x, const int _y, const int _w, const int _h, const int r, int g, int b ) void FillRect( SDL_Surface* _surface, const int _x, const int _y, const int _w, const int _h, const int r, int g, int b )
{ {
SDL_Rect rect = {Sint16(_x),Sint16(_y),Sint16(_w),Sint16(_h)}; SDL_Rect rect = {_x, _y, _w, _h};
Uint32 color = SDL_MapRGB(_surface->format, r, g, b); Uint32 color = SDL_MapRGB(_surface->format, r, g, b);
SDL_FillRect(_surface, &rect, color); SDL_FillRect(_surface, &rect, color);
} }
@ -400,7 +400,7 @@ void FillRect( SDL_Surface* _surface, const int color )
void FillRect( SDL_Surface* _surface, const int x, const int y, const int w, const int h, int rgba ) void FillRect( SDL_Surface* _surface, const int x, const int y, const int w, const int h, int rgba )
{ {
SDL_Rect rect = {Sint16(x) ,Sint16(y) ,Sint16(w) ,Sint16(h) }; SDL_Rect rect = {x, y, w, h};
SDL_FillRect(_surface, &rect, rgba); SDL_FillRect(_surface, &rect, rgba);
} }