#include <errno.h>
#include <unistd.h>
#include <SDL.h>
-#include <SDL_image.h>
-#include <physfs.h>
+//#include <SDL_image.h>
+//#include <physfs.h>
+#include <unison/vfs/FileSystem.hpp>
#include "title.hpp"
#include "mainloop.hpp"
{
/** Generating contrib levels list by making use of Level Subset */
std::vector<std::string> level_worlds;
- char** files = PHYSFS_enumerateFiles("levels/");
+ std::vector<std::string> files = Unison::VFS::FileSystem::get().ls("levels/");
+ for(std::vector<std::string>::iterator iter = files.begin();iter != files.end();++iter)
+ {
+ std::string filepath = "levels/" + *iter;
+ if(Unison::VFS::FileSystem::get().is_dir(filepath))
+ level_worlds.push_back(filepath);
+ }
+ /*char** files = PHYSFS_enumerateFiles("levels/");
for(const char* const* filename = files; *filename != 0; ++filename) {
std::string filepath = std::string("levels/") + *filename;
if(PHYSFS_isDirectory(filepath.c_str()))
level_worlds.push_back(filepath);
}
- PHYSFS_freeList(files);
+ PHYSFS_freeList(files);*/
free_contrib_menu();
contrib_menu.reset(new Menu());
{
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 installed addons
+ installed_addons = adm.get_installed_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);
- // hide installed addons from installation menu
+ // remove available addons that are already installed
std::vector<Addon>::iterator it2 = addons.begin();
while (it2 != addons.end()) {
Addon addon = *it2;
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)) {
+ if ((addon2.equals(addon)) && (!addon2.isInstalled)) {
addons.erase(it);
restart = true;
break;
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_deactive(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++) {
+ 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_hl();
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 {
+ available_addons = AddonManager::get_instance().get_available_addons();
+ 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.isInstalled) {
+ try {
+ addon.install();
+ //generate_addons_menu();
+ //Menu::set_current(addons_menu.get());
+ //addons_menu->set_active_item(index);
+ Menu::set_current(0);
+ }
+ catch (std::runtime_error e) {
+ log_warning << "Installation of Add-on failed: " << e.what() << std::endl;
+ }
+ } else {
+ try {
+ addon.remove();
+ //generate_addons_menu();
+ //Menu::set_current(addons_menu.get());
+ //addons_menu->set_active_item(index);
+ Menu::set_current(0);
+ }
+ catch (std::runtime_error e) {
+ log_warning << "Removal of Add-on failed: " << e.what() << std::endl;
+ }
+ }
}
+
}
void
player->set_controller(controller.get());
player->set_speedlimit(230); //MAX_WALK_XM
+ generate_main_menu();
+}
+
+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"));
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()) {
// reopen menu of user closed it (so that the app doesn't close when user
// accidently hit ESC)
if(Menu::current() == 0) {
+ generate_main_menu();
Menu::set_current(main_menu.get());
}
}
stream << "save/" << worlddirname << "_" << slot << ".stsg";
std::string slotfile = stream.str();
- try {
+ if(Unison::VFS::FileSystem::get().exists(slotfile))
+ {
lisp::Parser parser;
const lisp::Lisp* root = parser.parse(slotfile);
throw std::runtime_error("file is not a supertux-savegame.");
savegame->get("title", title);
- } catch(std::exception& ) {
+ }
+ else
+ {
std::ostringstream slottitle;
slottitle << _("Slot") << " " << slot << " - " << _("Free");
return slottitle.str();
projects / supertux.git / blobdiff