From 029463ad4748943dff787531ed3d2445d5a79105 Mon Sep 17 00:00:00 2001 From: Misa Date: Sat, 11 Sep 2021 02:24:55 -0700 Subject: [PATCH] Remove unused or useless `SDL_Rect`s from `Graphics` These were bfont_rect, bg_rect, foot_rect, and images_rect. bg_rect was only used once to draw the ghost buffer in the editor, but that was only because Ally didn't know you could just pass NULL in, cuz the ghost buffer is the same size as the backbuffer. --- desktop_version/src/Editor.cpp | 2 +- desktop_version/src/Graphics.cpp | 4 ---- desktop_version/src/Graphics.h | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp index 8f3be58c..850bf2e0 100644 --- a/desktop_version/src/Editor.cpp +++ b/desktop_version/src/Editor.cpp @@ -929,7 +929,7 @@ void editorrender(void) BlitSurfaceColoured(graphics.sprites[ed.ghosts[i].frame],NULL, graphics.ghostbuffer, &drawRect, graphics.ct); } } - SDL_BlitSurface(graphics.ghostbuffer, NULL, graphics.backBuffer, &graphics.bg_rect); + SDL_BlitSurface(graphics.ghostbuffer, NULL, graphics.backBuffer, NULL); } //Draw Cursor diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index 318f835d..92249f1b 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -19,8 +19,6 @@ void Graphics::init(void) flipmode = false; setRect(tiles_rect, 0,0,8,8); setRect(sprites_rect, 0,0,32,32); - setRect(bfont_rect, 0,0,8,8); - setRect(bg_rect, 0,0,320,240); setRect(footerrect, 0, 230, 320, 10); setRect(prect, 0, 0, 4, 4); setRect(line_rect, 0,0,0,0); @@ -103,11 +101,9 @@ void Graphics::init(void) // initialize everything else to zero backBuffer = NULL; ct = colourTransform(); - foot_rect = SDL_Rect(); foregrounddrawn = false; foregroundBuffer = NULL; backgrounddrawn = false; - images_rect = SDL_Rect(); m = 0; linedelay = 0; menubuffer = NULL; diff --git a/desktop_version/src/Graphics.h b/desktop_version/src/Graphics.h index f61e5919..693bcf5b 100644 --- a/desktop_version/src/Graphics.h +++ b/desktop_version/src/Graphics.h @@ -268,16 +268,12 @@ public: TowerBG towerbg; TowerBG titlebg; - SDL_Rect bfont_rect; SDL_Rect tiles_rect; SDL_Rect sprites_rect; - SDL_Rect images_rect; - SDL_Rect bg_rect; SDL_Rect line_rect; SDL_Rect tele_rect; SDL_Rect towerbuffer_rect; - SDL_Rect foot_rect; SDL_Rect prect; SDL_Rect footerrect; SDL_Surface* footerbuffer;