[Pingus-CVS] r3690 - in trunk/pingus/src: . screen

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-05 09:11:08 +0200 (Sat, 05 Jul 2008)
New Revision: 3690

Modified:
   trunk/pingus/src/global_event.cpp
   trunk/pingus/src/screen/screen_manager.cpp
   trunk/pingus/src/screen/screen_manager.hpp
Log:
Removed redundant get_screen() function

Modified: trunk/pingus/src/global_event.cpp
===================================================================
--- trunk/pingus/src/global_event.cpp   2008-07-05 07:10:46 UTC (rev 3689)
+++ trunk/pingus/src/global_event.cpp   2008-07-05 07:11:08 UTC (rev 3690)
@@ -62,13 +62,13 @@
 
       case SDLK_F5:
         if (maintainer_mode)
-          if 
(!dynamic_cast<OptionMenu*>(ScreenManager::instance()->get_screen()))
+          if 
(!dynamic_cast<OptionMenu*>(ScreenManager::instance()->get_current_screen().get()))
             ScreenManager::instance()->push_screen(new OptionMenu());
         break;
 
       case SDLK_F6:
         if (maintainer_mode)
-          if 
(!dynamic_cast<AddOnMenu*>(ScreenManager::instance()->get_screen()))
+          if 
(!dynamic_cast<AddOnMenu*>(ScreenManager::instance()->get_current_screen().get()))
             ScreenManager::instance()->push_screen(new AddOnMenu());
         break;
 

Modified: trunk/pingus/src/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.cpp  2008-07-05 07:10:46 UTC (rev 
3689)
+++ trunk/pingus/src/screen/screen_manager.cpp  2008-07-05 07:11:08 UTC (rev 
3690)
@@ -308,12 +308,6 @@
   get_current_screen()->resize(size);
 }
 
-Screen*
-ScreenManager::get_screen()
-{
-  return get_current_screen().get();
-}
-
 void
 ScreenManager::show_swcursor(bool v)
 {

Modified: trunk/pingus/src/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.hpp  2008-07-05 07:10:46 UTC (rev 
3689)
+++ trunk/pingus/src/screen/screen_manager.hpp  2008-07-05 07:11:08 UTC (rev 
3690)
@@ -78,9 +78,6 @@
   /** @return a pointer to the current Screen */
   ScreenPtr get_current_screen();
 
-  /** @return a pointer to the current Screen */
-  Screen* get_screen();
-
   void show_swcursor(bool v);
   bool swcursor_visible();