#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <math.h>
#include <errno.h>
#include <unistd.h>
-#include <cmath>
#include <SDL.h>
#include <SDL_image.h>
#include <physfs.h>
{
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)
{
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
void
TitleScreen::make_tux_jump()
{
- static Timer randomWaitTimer;
- static Timer jumpPushTimer;
- static float last_tux_x_pos = -1;
- static float last_tux_y_pos = -1;
-
+ static bool jumpWasReleased = true;
Sector* sector = titlesession->get_current_sector();
Player* tux = sector->player;
- //sector->play_music(LEVEL_MUSIC);
-
controller->update();
controller->press(Controller::RIGHT);
- // Determine how far we moved since last frame
- float dx = fabsf(last_tux_x_pos - tux->get_pos().x);
- float dy = fabsf(last_tux_y_pos - tux->get_pos().y);
-
- // Calculate space to check for obstacles
- Rect lookahead = tux->get_bbox();
- lookahead.move(Vector(96, 0));
-
// Check if we should press the jump button
- bool randomJump = !randomWaitTimer.started();
- bool notMoving = (fabsf(dx) + fabsf(dy)) < 0.1;
+ Rect lookahead = tux->get_bbox();
+ lookahead.p2.x += 96;
bool pathBlocked = !sector->is_free_of_statics(lookahead);
- if (!controller->released(Controller::JUMP)
- && (notMoving || pathBlocked || randomJump)) {
- float jumpDuration;
- if(pathBlocked)
- jumpDuration = 0.5;
- else
- jumpDuration = systemRandom.randf(0.3, 0.8);
- jumpPushTimer.start(jumpDuration);
- randomWaitTimer.start(systemRandom.randf(3.0, 6.0));
- }
-
- // Keep jump button pressed
- if (jumpPushTimer.started())
+ if ((pathBlocked && jumpWasReleased) || !tux->on_ground()) {
controller->press(Controller::JUMP);
-
- // Remember last position, so we can determine if we moved
- last_tux_x_pos = tux->get_pos().x;
- last_tux_y_pos = tux->get_pos().y;
+ jumpWasReleased = false;
+ } else {
+ jumpWasReleased = true;
+ }
// Wrap around at the end of the level back to the beginnig
if(sector->get_width() - 320 < tux->get_pos().x) {
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"));
Sector* sector = titlesession->get_current_sector();
sector->draw(context);
- context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",
- Vector(0, SCREEN_HEIGHT - 50), LEFT_ALLIGN, LAYER_FOREGROUND1);
+ context.draw_text(white_small_text, "SuperTux " PACKAGE_VERSION "\n",
+ Vector(5, SCREEN_HEIGHT - 50), ALIGN_LEFT, LAYER_FOREGROUND1);
context.draw_text(white_small_text,
_(
-"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(0, SCREEN_HEIGHT - 50 + white_small_text->get_height() + 5),
- LEFT_ALLIGN, LAYER_FOREGROUND1);
+ Vector(5, SCREEN_HEIGHT - 50 + white_small_text->get_height() + 5),
+ ALIGN_LEFT, LAYER_FOREGROUND1);
}
void
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());
}
}
try {
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse(slotfile));
+ const lisp::Lisp* root = parser.parse(slotfile);
const lisp::Lisp* savegame = root->get_lisp("supertux-savegame");
if(!savegame)
projects / supertux.git / blobdiff