Removed trailing whitespaces and fixed svn:eol-style for the tileset files

[supertux.git] / src / title.hpp

diff --git a/src/title.hpp b/src/title.hpp
index aa26473..39d0abf 100644 (file)
--- a/src/title.hpp
+++ b/src/title.hpp
@@ -1,8 +1,8 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -13,7 +13,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -37,6 +37,7 @@ public:
   virtual ~TitleScreen();
 
   virtual void setup();
+  virtual void leave();
 
   virtual void draw(DrawingContext& context);
 
@@ -53,16 +54,16 @@ private:
   void check_contrib_world_menu();
   void free_contrib_menu();
 
+  std::auto_ptr<Menu> main_menu;
   std::auto_ptr<Menu> load_game_menu;
   std::auto_ptr<Menu> contrib_menu;
   std::auto_ptr<Menu> contrib_world_menu;
+  std::auto_ptr<World> main_world;
   std::vector<World*> contrib_worlds;
-  int current_world;
-  World* current_contrib_world;
-  
+  World* current_world;
+
   std::auto_ptr<CodeController> controller;
   std::auto_ptr<GameSession> titlesession;
 };
 
 #endif
-