mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-22 08:49:46 +01:00
Code Issues Releases Wiki Activity

Remove unused vars from Graphics/GraphicsResources

Browse source 
These unused vars are:
 - Graphics::bfontmask_rect
 - Graphics::backgrounds
 - Graphics::bfontmask
 - GraphicsResources::im_bfontmask

While it seems that Graphics::backgrounds was indexed in
Graphics::drawbackground(), in reality there was never anything in that
vector and thus actually using it would cause a segfault.
This commit is contained in:
Misa 2020-07-03 02:20:07 -07:00 committed by Ethan Lee
parent adca6a122a
commit 4c6ab6e6b7
4 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop_version/src/Graphics.cpp
View file

@ -16,7 +16,6 @@ void Graphics::init()
setRect(tiles_rect, 0,0,8,8); setRect(tiles_rect, 0,0,8,8);
setRect(sprites_rect, 0,0,32,32); setRect(sprites_rect, 0,0,32,32);
setRect(bfont_rect, 0,0,8,8); setRect(bfont_rect, 0,0,8,8);
setRect(bfontmask_rect, 0,0,8,8);
setRect(bg_rect, 0,0,320,240); setRect(bg_rect, 0,0,320,240);
setRect(footerrect, 0, 230, 320, 10); setRect(footerrect, 0, 230, 320, 10);
setRect(prect, 0, 0, 4, 4); setRect(prect, 0, 0, 4, 4);
@ -2217,7 +2216,6 @@ void Graphics::drawbackground( int t )
break; break;
default: default:
FillRect(backBuffer, 0x000000 ); FillRect(backBuffer, 0x000000 );
BlitSurfaceStandard(backgrounds[t], NULL, backBuffer, &bg_rect);
break; break;
} }

4
desktop_version/src/Graphics.h
View file

@ -215,7 +215,6 @@ public:
int m; int m;
std::vector <SDL_Surface*> backgrounds;
std::vector <SDL_Surface*> images; std::vector <SDL_Surface*> images;
std::vector <SDL_Surface*> tele; std::vector <SDL_Surface*> tele;
@ -226,9 +225,7 @@ public:
std::vector <SDL_Surface*> sprites; std::vector <SDL_Surface*> sprites;
std::vector <SDL_Surface*> flipsprites; std::vector <SDL_Surface*> flipsprites;
std::vector <SDL_Surface*> bfont; std::vector <SDL_Surface*> bfont;
std::vector <SDL_Surface*> bfontmask;
std::vector <SDL_Surface*> flipbfont; std::vector <SDL_Surface*> flipbfont;
std::vector <SDL_Surface*> flipbfontmask;
bool flipmode; bool flipmode;
bool setflipmode; bool setflipmode;
@ -246,7 +243,6 @@ public:
SDL_Rect bfont_rect; SDL_Rect bfont_rect;
SDL_Rect tiles_rect; SDL_Rect tiles_rect;
SDL_Rect sprites_rect; SDL_Rect sprites_rect;
SDL_Rect bfontmask_rect;
SDL_Rect images_rect; SDL_Rect images_rect;
SDL_Rect bg_rect; SDL_Rect bg_rect;
SDL_Rect line_rect; SDL_Rect line_rect;

2
desktop_version/src/GraphicsResources.cpp
View file

@ -89,7 +89,6 @@ void GraphicsResources::init(void)
im_sprites = LoadImage("graphics/sprites.png"); im_sprites = LoadImage("graphics/sprites.png");
im_flipsprites = LoadImage("graphics/flipsprites.png"); im_flipsprites = LoadImage("graphics/flipsprites.png");
im_bfont = LoadImage("graphics/font.png"); im_bfont = LoadImage("graphics/font.png");
im_bfontmask = LoadImage("graphics/fontmask.png");
im_teleporter = LoadImage("graphics/teleporter.png"); im_teleporter = LoadImage("graphics/teleporter.png");
im_image0 = LoadImage("graphics/levelcomplete.png", false); im_image0 = LoadImage("graphics/levelcomplete.png", false);
@ -117,7 +116,6 @@ void GraphicsResources::destroy(void)
SDL_FreeSurface(im_sprites); SDL_FreeSurface(im_sprites);
SDL_FreeSurface(im_flipsprites); SDL_FreeSurface(im_flipsprites);
SDL_FreeSurface(im_bfont); SDL_FreeSurface(im_bfont);
SDL_FreeSurface(im_bfontmask);
SDL_FreeSurface(im_teleporter); SDL_FreeSurface(im_teleporter);
SDL_FreeSurface(im_image0); SDL_FreeSurface(im_image0);

1
desktop_version/src/GraphicsResources.h
View file

@ -16,7 +16,6 @@ public:
SDL_Surface* im_sprites; SDL_Surface* im_sprites;
SDL_Surface* im_flipsprites; SDL_Surface* im_flipsprites;
SDL_Surface* im_bfont; SDL_Surface* im_bfont;
SDL_Surface* im_bfontmask;
SDL_Surface* im_teleporter; SDL_Surface* im_teleporter;
SDL_Surface* im_image0; SDL_Surface* im_image0;
SDL_Surface* im_image1; SDL_Surface* im_image1;