X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=f706e9334248dd884f3076d3215a398cfb5fbebf;hb=75acd4b141f45e851a492f089aa9ad24a9552409;hp=93caf43949b124e2f5d5f849df2a18b0a93cd0ce;hpb=37afc25157dc5c2da47d5cf762318f2eda7f2aec;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index 93caf4394..f706e9334 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -18,53 +18,34 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-#include <config.h>
 
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <cmath>
-#include <SDL.h>
-#include <SDL_image.h>
-#include <physfs.h>
+#include <config.h>
+#include <version.h>
 
 #include "title.hpp"
-#include "mainloop.hpp"
-#include "video/drawing_context.hpp"
-#include "video/surface.hpp"
+
+#include "addon/addon_manager.hpp"
 #include "audio/sound_manager.hpp"
+#include "fadeout.hpp"
+#include "file_system.hpp"
+#include "gameconfig.hpp"
+#include "gettext.hpp"
 #include "gui/menu.hpp"
-#include "timer.hpp"
-#include "lisp/lisp.hpp"
 #include "lisp/parser.hpp"
-#include "level.hpp"
-#include "world.hpp"
-#include "game_session.hpp"
-#include "worldmap/worldmap.hpp"
-#include "player_status.hpp"
-#include "tile.hpp"
-#include "sector.hpp"
-#include "object/tilemap.hpp"
+#include "log.hpp"
+#include "main.hpp"
+#include "mainloop.hpp"
 #include "object/camera.hpp"
 #include "object/player.hpp"
+#include "options_menu.hpp"
 #include "resources.hpp"
-#include "gettext.hpp"
+#include "sector.hpp"
 #include "textscroller.hpp"
-#include "fadeout.hpp"
-#include "file_system.hpp"
-#include "control/joystickkeyboardcontroller.hpp"
-#include "control/codecontroller.hpp"
-#include "main.hpp"
-#include "log.hpp"
-#include "options_menu.hpp"
-#include "console.hpp"
-#include "random_generator.hpp"
-#include "addon_manager.hpp"
+#include "video/drawing_context.hpp"
+#include "world.hpp"
+
+#include <algorithm>
+#include <physfs.h>
 
 enum MainMenuIDs {
   MNID_STARTGAME,
@@ -79,15 +60,6 @@ enum MainMenuIDs {
 void
 TitleScreen::update_load_game_menu()
 {
-  load_game_menu.reset(new Menu());
-
-  load_game_menu->add_label(_("Start Game"));
-  load_game_menu->add_hl();
-  for(int i = 1; i <= 5; ++i) {
-    load_game_menu->add_entry(i, get_slotinfo(i));
-  }
-  load_game_menu->add_hl();
-  load_game_menu->add_back(_("Back"));
 }
 
 void
@@ -131,9 +103,7 @@ TitleScreen::generate_contrib_menu()
       contrib_menu->add_entry(i++, world->title);
       contrib_worlds.push_back(world.release());
     } catch(std::exception& e) {
-#ifdef DEBUG
       log_warning << "Couldn't parse levelset info for '" << *it << "': " << e.what() << std::endl;
-#endif
     }
   }
 
@@ -146,7 +116,7 @@ TitleScreen::get_level_name(const std::string& filename)
 {
   try {
     lisp::Parser parser;
-    std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+    const lisp::Lisp* root = parser.parse(filename);
 
     const lisp::Lisp* level = root->get_lisp("supertux-level");
     if(!level)
@@ -156,7 +126,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 "";
   }
@@ -172,8 +142,7 @@ TitleScreen::check_levels_contrib_menu()
   current_world = contrib_worlds[index];
 
   if(!current_world->is_levelset) {
-    update_load_game_menu();
-    Menu::push_current(load_game_menu.get());
+    start_game();
   } else {
     contrib_world_menu.reset(new Menu());
 
@@ -210,57 +179,47 @@ 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;
 }
 
 void
 TitleScreen::generate_addons_menu()
 {
   AddonManager& adm = AddonManager::get_instance();
-  addons = adm.get_addons();
 
-  // sort addons
+  // refresh list of addons
+  addons = adm.get_addons();
+  
+  // sort list
   std::sort(addons.begin(), addons.end(), generate_addons_menu_sorter);
 
-  // hide installed addons from installation menu
-  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.title == addon.title) && (!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());
 
   addons_menu->add_label(_("Add-ons"));
   addons_menu->add_hl();
+  
+#ifdef HAVE_LIBCURL
+  addons_menu->add_entry(0, std::string(_("Check Online")));
+#else
+  addons_menu->add_inactive(0, std::string(_("Check Online (disabled)")));
+#endif
 
-  int i = 0;
-  for (std::vector<Addon>::iterator it = addons.begin(); it != addons.end(); ++it) {
-    Addon addon = *it;
-    if (addon.isInstalled) {
-      addons_menu->add_entry(i++, std::string(_("Remove")) + " \"" + addon.title + "\"");
-    } else {
-      addons_menu->add_entry(i++, std::string(_("Install")) + " \"" + addon.title + "\"");
-    }
+  //addons_menu->add_hl();
+
+  for (unsigned int i = 0; i < addons.size(); 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.loaded);
   }
 
   addons_menu->add_hl();
@@ -273,16 +232,48 @@ TitleScreen::check_addons_menu()
   int index = addons_menu->check();
   if (index == -1) return;
 
-  //AddonManager& adm = AddonManager::get_instance();
-  Addon addon = addons[index];
-  if (!addon.isInstalled) {
-    addon.install();
-    generate_addons_menu();
-    Menu::set_current(addons_menu.get());
-  } else {
-    addon.remove();
-    generate_addons_menu();
-    Menu::set_current(addons_menu.get());
+  // check if "Check Online" was chosen
+  if (index == 0) {
+    try {
+      AddonManager::get_instance().check_online();
+      generate_addons_menu();
+      Menu::set_current(addons_menu.get());
+      addons_menu->set_active_item(index);
+    } 
+    catch (std::runtime_error e) {
+      log_warning << "Check for available Add-ons failed: " << e.what() << std::endl;
+    }
+    return;
+  }
+
+  // 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.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 {
+        AddonManager::get_instance().enable(&addon);
+      } 
+      catch (std::runtime_error e) {
+        log_warning << "Enabling Add-on failed: " << e.what() << std::endl;
+      }
+      addons_menu->set_toggled(index, addon.loaded);
+    } else {
+      try {
+        AddonManager::get_instance().disable(&addon);
+      } 
+      catch (std::runtime_error e) {
+        log_warning << "Disabling Add-on failed: " << e.what() << std::endl;
+      }
+      addons_menu->set_toggled(index, addon.loaded);
+    }
   }
 }
 
@@ -312,7 +303,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());
@@ -328,6 +319,14 @@ TitleScreen::TitleScreen()
   player->set_controller(controller.get());
   player->set_speedlimit(230); //MAX_WALK_XM
 
+  generate_main_menu();
+
+  frame = std::auto_ptr<Surface>(new Surface("images/engine/menu/frame.png"));
+}
+
+void
+TitleScreen::generate_main_menu()
+{
   main_menu.reset(new Menu());
   main_menu->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2 + 35);
   main_menu->add_entry(MNID_STARTGAME, _("Start Game"));
@@ -370,15 +369,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) 2006 SuperTux Devel Team\n"
+"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);
 }
 
@@ -393,8 +395,6 @@ TitleScreen::update(float elapsed_time)
 
   Menu* menu = Menu::current();
   if(menu) {
-    menu->update();
-
     if(menu == main_menu.get()) {
       switch (main_menu->check()) {
         case MNID_STARTGAME:
@@ -404,45 +404,32 @@ TitleScreen::update(float elapsed_time)
             main_world->load("levels/world1/info");
           }
           current_world = main_world.get();
-          update_load_game_menu();
-          Menu::push_current(load_game_menu.get());
+          start_game();
           break;
+
         case MNID_LEVELS_CONTRIB:
           // Contrib Menu
           generate_contrib_menu();
           Menu::push_current(contrib_menu.get());
           break;
+
         case MNID_ADDONS:
           // Add-ons Menu
           generate_addons_menu();
           Menu::push_current(addons_menu.get());
           break;
+
         case MNID_CREDITS:
+          Menu::set_current(NULL);
           main_loop->push_screen(new TextScroller("credits.txt"),
                                  new FadeOut(0.5));
           break;
+
         case MNID_QUITMAINMENU:
           main_loop->quit(new FadeOut(0.25));
+          sound_manager->stop_music(0.25);
           break;
       }
-    } else if(menu == load_game_menu.get()) {
-      /*
-      if(event.key.keysym.sym == SDLK_DELETE) {
-        int slot = menu->get_active_item_id();
-        std::stringstream stream;
-        stream << slot;
-        std::string str = _("Are you sure you want to delete slot") + stream.str() + "?";
-
-        if(confirm_dialog(bkg_title, str.c_str())) {
-          str = "save/slot" + stream.str() + ".stsg";
-          log_debug << "Removing: " << str << std::endl;
-          PHYSFS_delete(str.c_str());
-        }
-
-        update_load_save_game_menu(load_game_menu);
-        Menu::set_current(main_menu.get());
-      }*/
-      process_load_game_menu();
     } else if(menu == contrib_menu.get()) {
       check_levels_contrib_menu();
     } else if(menu == addons_menu.get()) {
@@ -452,62 +439,23 @@ TitleScreen::update(float elapsed_time)
     }
   }
 
-  // reopen menu of user closed it (so that the app doesn't close when user
+  // reopen menu if user closed it (so that the app doesn't close when user
   // accidently hit ESC)
-  if(Menu::current() == 0) {
+  if(Menu::current() == 0 && main_loop->has_no_pending_fadeout()) {
+    generate_main_menu();
     Menu::set_current(main_menu.get());
   }
 }
 
-std::string
-TitleScreen::get_slotinfo(int slot)
+void
+TitleScreen::start_game()
 {
-  std::string tmp;
-  std::string title;
-
+  Menu::set_current(NULL);
   std::string basename = current_world->get_basedir();
   basename = basename.substr(0, basename.length()-1);
   std::string worlddirname = FileSystem::basename(basename);
   std::ostringstream stream;
-  stream << "save/" << worlddirname << "_" << slot << ".stsg";
-  std::string slotfile = stream.str();
-
-  try {
-    lisp::Parser parser;
-    std::auto_ptr<lisp::Lisp> root (parser.parse(slotfile));
-
-    const lisp::Lisp* savegame = root->get_lisp("supertux-savegame");
-    if(!savegame)
-      throw std::runtime_error("file is not a supertux-savegame.");
-
-    savegame->get("title", title);
-  } catch(std::exception& ) {
-    std::ostringstream slottitle;
-    slottitle << _("Slot") << " " << slot << " - " << _("Free");
-    return slottitle.str();
-  }
-
-  std::ostringstream slottitle;
-  slottitle << _("Slot") << " " << slot << " - " << title;
-  return slottitle.str();
-}
-
-bool
-TitleScreen::process_load_game_menu()
-{
-  int slot = load_game_menu->check();
-
-  if(slot == -1)
-    return false;
-
-  if(load_game_menu->get_item_by_id(slot).kind != MN_ACTION)
-    return false;
-
-  std::string basename = current_world->get_basedir();
-  basename = basename.substr(0, basename.length()-1);
-  std::string worlddirname = FileSystem::basename(basename);
-  std::stringstream stream;
-  stream << "save/" << worlddirname << "_" << slot << ".stsg";
+  stream << "profile" << config->profile << "/" << worlddirname << ".stsg";
   std::string slotfile = stream.str();
 
   try {
@@ -516,6 +464,4 @@ TitleScreen::process_load_game_menu()
   } catch(std::exception& e) {
     log_fatal << "Couldn't start world: " << e.what() << std::endl;
   }
-
-  return true;
 }