From 176de8ede6f1b381a2312310fabe02ea4888ea22 Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Tue, 26 Oct 2010 21:37:36 +0000 Subject: [PATCH] Remove unused member in title screen dialog. --- src/gui/dialogs/title_screen.cpp | 13 ++----------- src/gui/dialogs/title_screen.hpp | 7 ------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/gui/dialogs/title_screen.cpp b/src/gui/dialogs/title_screen.cpp index eddf175276c..88e70d543b4 100644 --- a/src/gui/dialogs/title_screen.cpp +++ b/src/gui/dialogs/title_screen.cpp @@ -94,8 +94,7 @@ static bool hotkey(twindow& window, const ttitle_screen::tresult result) } ttitle_screen::ttitle_screen() - : video_(NULL) - , logo_timer_id_(0) + : logo_timer_id_(0) { } @@ -257,11 +256,8 @@ void ttitle_screen::post_build(CVideo& video, twindow& window) , QUIT_GAME)); } -void ttitle_screen::pre_show(CVideo& video, twindow& window) +void ttitle_screen::pre_show(CVideo&, twindow& window) { - assert(!video_); - video_ = &video; - set_restore(false); window.set_click_dismiss(false); window.set_enter_disabled(true); @@ -348,11 +344,6 @@ void ttitle_screen::pre_show(CVideo& video, twindow& window) } } -void ttitle_screen::post_show(twindow& /*window*/) -{ - video_ = NULL; -} - void ttitle_screen::update_tip(twindow& window, const bool previous) { tmulti_page& tips = find_widget(&window, "tips", false); diff --git a/src/gui/dialogs/title_screen.hpp b/src/gui/dialogs/title_screen.hpp index 46b68b2a32a..71c79a75b41 100644 --- a/src/gui/dialogs/title_screen.hpp +++ b/src/gui/dialogs/title_screen.hpp @@ -27,8 +27,6 @@ public: ~ttitle_screen(); - CVideo* video() { return video_; } - /** * Values for the menu-items of the main menu. * @@ -63,8 +61,6 @@ public: }; private: - /** Used in show in order to show child windows. */ - CVideo* video_; /** Inherited from tdialog, implemented by REGISTER_WINDOW. */ virtual const std::string& window_id() const; @@ -75,9 +71,6 @@ private: /** Inherited from tdialog. */ void pre_show(CVideo& video, twindow& window); - /** Inherited from tdialog. */ - void post_show(twindow& window); - /** The progress bar time for the logo. */ unsigned long logo_timer_id_;