From 5c366bce092e1e6c6fbb3c2afefb9ae3ad43d868 Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Wed, 6 Jan 2010 07:48:42 +0000 Subject: [PATCH] Remove unneeded locals --- disc_menu.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/disc_menu.cpp b/disc_menu.cpp index c7cc369..ade4423 100644 --- a/disc_menu.cpp +++ b/disc_menu.cpp @@ -31,9 +31,6 @@ public: protected: DiscMenu *menu; GameInfoBox *gameInfo; - SDL_Surface *bg; - SDL_Surface *infobox; - SDL_Surface *disc_info; }; @@ -155,10 +152,6 @@ DiscView::DiscView() : GuiView() { this->menu = new DiscMenu(NULL); this->gameInfo = new GameInfoBox(NULL); - - this->bg = NULL; - this->infobox = NULL; - this->disc_info = NULL; } DiscView::~DiscView() @@ -179,10 +172,6 @@ void DiscView::setDirectory(const char *path) void DiscView::updateTheme() { - this->bg = Gui::gui->main_menu_bg; - this->infobox = Gui::gui->infobox; - this->disc_info = Gui::gui->disc_info; - this->gameInfo->setFont(Gui::gui->small_font); this->menu->setFont(Gui::gui->default_font); this->menu->setSelectedBackground(Gui::gui->bg_left, Gui::gui->bg_middle, @@ -206,10 +195,10 @@ void DiscView::draw(SDL_Surface *where) /* Blit the backgrounds */ dst = (SDL_Rect){20,45,300,400}; - SDL_BlitSurface(this->bg, NULL, where, &dst); + SDL_BlitSurface(Gui::gui->main_menu_bg, NULL, where, &dst); dst = (SDL_Rect){350,13,0,0}; - SDL_BlitSurface(this->disc_info, NULL, where, &dst); + SDL_BlitSurface(Gui::gui->disc_info, NULL, where, &dst); this->menu->draw(where, 50, 70, 280, 375); this->gameInfo->draw(where, 360, 55, 262, 447);