X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=a187aeaad9705fdad5d510f6030b5ecebbc907b5;hb=43db9a6c44b6ee544e7694d1bb234ba559b0849c;hp=b43e09c9a50bef5179a91b20f4f26cd39c8d0946;hpb=a982e2b5dbe5446ed1c3bf6e236947b6711ef4c0;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index b43e09c9a..a187aeaad 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -66,7 +66,7 @@
 #include "options_menu.hpp"
 #include "console.hpp"
 #include "random_generator.hpp"
-#include "addon_manager.hpp"
+#include "addon/addon_manager.hpp"
 
 enum MainMenuIDs {
   MNID_STARTGAME,
@@ -149,7 +149,7 @@ TitleScreen::get_level_name(const std::string& filename)
     level->get("name", name);
     return name;
   } catch(std::exception& e) {
-	  log_warning << "Problem getting name of '" << filename << "': "
+      log_warning << "Problem getting name of '" << filename << "': "
                   << e.what() << std::endl;
     return "";
   }
@@ -202,9 +202,9 @@ TitleScreen::check_contrib_world_menu()
 }
 
 namespace {
-  bool generate_addons_menu_sorter(const Addon& a1, const Addon& a2)
+  bool generate_addons_menu_sorter(const Addon* a1, const Addon* a2)
   {
-    return a1.title < a2.title;
+    return a1->title < a2->title;
   }
 
   const int ADDON_LIST_START_ID = 10;
@@ -215,43 +215,12 @@ TitleScreen::generate_addons_menu()
 {
   AddonManager& adm = AddonManager::get_instance();
 
-  // refresh list of installed addons
-  installed_addons = adm.get_installed_addons();
+  // refresh list of addons
+  addons = adm.get_addons();
   
-  // build new Add-on list
-  addons.clear();
-
-  // add installed addons to list
-  addons.insert(addons.end(), installed_addons.begin(), installed_addons.end());
-
-  // add available addons to list
-  addons.insert(addons.end(), available_addons.begin(), available_addons.end());
-
   // sort list
   std::sort(addons.begin(), addons.end(), generate_addons_menu_sorter);
 
-  // remove available addons that are already installed
-  std::vector<Addon>::iterator it2 = addons.begin();
-  while (it2 != addons.end()) {
-    Addon addon = *it2;
-    if (addon.isInstalled) {
-      bool restart = false;
-      for (std::vector<Addon>::iterator it = addons.begin(); it != addons.end(); ++it) {
-        Addon addon2 = *it;
-        if ((addon2.equals(addon)) && (!addon2.isInstalled)) {
-          addons.erase(it);
-          restart = true;
-          break;
-        }
-      }
-      if (restart) {
-        it2 = addons.begin();
-        continue;
-      }
-    }
-    it2++;
-  }
-
   // (re)generate menu
   free_addons_menu();
   addons_menu.reset(new Menu());
@@ -262,18 +231,18 @@ TitleScreen::generate_addons_menu()
 #ifdef HAVE_LIBCURL
   addons_menu->add_entry(0, std::string(_("Check Online")));
 #else
-  addons_menu->add_deactive(0, std::string(_("Check Online (disabled)")));
+  addons_menu->add_inactive(0, std::string(_("Check Online (disabled)")));
 #endif
 
   //addons_menu->add_hl();
 
   for (unsigned int i = 0; i < addons.size(); i++) {
-    Addon addon = addons[i];
+    const Addon& addon = *addons[i];
     std::string text = "";
     if (addon.kind != "") text += addon.kind + " ";
     text += std::string("\"") + addon.title + "\"";
     if (addon.author != "") text += " by \"" + addon.author + "\"";
-    addons_menu->add_toggle(ADDON_LIST_START_ID + i, text, addon.isInstalled);
+    addons_menu->add_toggle(ADDON_LIST_START_ID + i, text, addon.loaded);
   }
 
   addons_menu->add_hl();
@@ -289,7 +258,7 @@ TitleScreen::check_addons_menu()
   // check if "Check Online" was chosen
   if (index == 0) {
     try {
-      available_addons = AddonManager::get_instance().get_available_addons();
+      AddonManager::get_instance().check_online();
       generate_addons_menu();
       Menu::set_current(addons_menu.get());
       addons_menu->set_active_item(index);
@@ -302,32 +271,33 @@ TitleScreen::check_addons_menu()
 
   // if one of the Addons listed was chosen, take appropriate action
   if ((index >= ADDON_LIST_START_ID) && (index < ADDON_LIST_START_ID) + addons.size()) {
-    Addon addon = addons[index - ADDON_LIST_START_ID];
-    if (!addon.isInstalled) {
+    Addon& addon = *addons[index - ADDON_LIST_START_ID];
+    if (!addon.installed) {
+      try {
+        AddonManager::get_instance().install(&addon);
+      } 
+      catch (std::runtime_error e) {
+        log_warning << "Installing Add-on failed: " << e.what() << std::endl;
+      }
+      addons_menu->set_toggled(index, addon.loaded);
+    } else if (!addon.loaded) {
       try {
-        addon.install();
-        //generate_addons_menu();
-        //Menu::set_current(addons_menu.get());
-        //addons_menu->set_active_item(index);
-        Menu::set_current(0);
+        AddonManager::get_instance().enable(&addon);
       } 
       catch (std::runtime_error e) {
-        log_warning << "Installation of Add-on failed: " << e.what() << std::endl;
+        log_warning << "Enabling Add-on failed: " << e.what() << std::endl;
       }
+      addons_menu->set_toggled(index, addon.loaded);
     } else {
       try {
-        addon.remove();
-        //generate_addons_menu();
-        //Menu::set_current(addons_menu.get());
-        //addons_menu->set_active_item(index);
-        Menu::set_current(0);
+        AddonManager::get_instance().disable(&addon);
       } 
       catch (std::runtime_error e) {
-        log_warning << "Removal of Add-on failed: " << e.what() << std::endl;
+        log_warning << "Disabling Add-on failed: " << e.what() << std::endl;
       }
+      addons_menu->set_toggled(index, addon.loaded);
     }
   }
-
 }
 
 void
@@ -356,7 +326,7 @@ TitleScreen::make_tux_jump()
     jumpWasReleased = true;
   }
 
-  // Wrap around at the end of the level back to the beginnig
+  // Wrap around at the end of the level back to the beginning
   if(sector->get_width() - 320 < tux->get_pos().x) {
     sector->activate("main");
     sector->camera->reset(tux->get_pos());
@@ -373,6 +343,8 @@ TitleScreen::TitleScreen()
   player->set_speedlimit(230); //MAX_WALK_XM
 
   generate_main_menu();
+
+  frame = std::auto_ptr<Surface>(new Surface("images/engine/menu/frame.png"));
 }
 
 void
@@ -420,15 +392,18 @@ TitleScreen::draw(DrawingContext& context)
   Sector* sector  = titlesession->get_current_sector();
   sector->draw(context);
 
-  context.draw_text(white_small_text, "SuperTux " PACKAGE_VERSION "\n",
+  // FIXME: Add something to scale the frame to the resolution of the screen
+  context.draw_surface(frame.get(), Vector(0,0),LAYER_FOREGROUND1);
+
+  context.draw_text(small_font, "SuperTux " PACKAGE_VERSION "\n",
       Vector(5, SCREEN_HEIGHT - 50), ALIGN_LEFT, LAYER_FOREGROUND1);
-  context.draw_text(white_small_text,
+  context.draw_text(small_font,
       _(
 "Copyright (c) 2007 SuperTux Devel Team\n"
 "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n"
 "redistribute it under certain conditions; see the file COPYING for details.\n"
 ),
-      Vector(5, SCREEN_HEIGHT - 50 + white_small_text->get_height() + 5),
+      Vector(5, SCREEN_HEIGHT - 50 + small_font->get_height() + 5),
       ALIGN_LEFT, LAYER_FOREGROUND1);
 }
 
@@ -476,7 +451,7 @@ TitleScreen::update(float elapsed_time)
 
         case MNID_QUITMAINMENU:
           main_loop->quit(new FadeOut(0.25));
-		  sound_manager->stop_music(0.25);
+          sound_manager->stop_music(0.25);
           break;
       }
     } else if(menu == contrib_menu.get()) {