New grow and skid sounds from remaxim

[supertux.git] / src / title.hpp

diff --git a/src/title.hpp b/src/title.hpp
index 5844bec..9a267ad 100644 (file)
--- a/src/title.hpp
+++ b/src/title.hpp
@@ -25,7 +25,7 @@
 #include <vector>
 #include "screen.hpp"
 #include "game_session.hpp"
-#include "addon.hpp"
+#include "addon/addon.hpp"
 
 class Menu;
 class World;
@@ -48,9 +48,8 @@ public:
   virtual void update(float elapsed_time);
 
 private:
-  std::string get_slotinfo(int slot);
   std::string get_level_name(const std::string& levelfile);
-  bool process_load_game_menu();
+  void start_game();
   void make_tux_jump();
   void update_load_game_menu();
   void generate_main_menu();
@@ -63,17 +62,15 @@ private:
   void free_addons_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;
   std::auto_ptr<Menu> addons_menu;
-  std::vector<Addon> addons; /**< shown list of Add-ons */
-  std::vector<Addon> available_addons; /**< list of downloadable Add-ons */
-  std::vector<Addon> installed_addons; /**< list of currently installed Add-ons */
+  std::vector<Addon*> addons; /**< shown list of Add-ons */
   World* current_world;
 
+  std::auto_ptr<Surface> frame;
   std::auto_ptr<CodeController> controller;
   std::auto_ptr<GameSession> titlesession;
 };