#include "control/joystickkeyboardcontroller.hpp"
#include "control/codecontroller.hpp"
#include "main.hpp"
-#include "exceptions.hpp"
-#include "msg.hpp"
+#include "log.hpp"
#include "console.hpp"
void
delete *i;
contrib_worlds.clear();
- current_contrib_world = 0;
- current_world = -1;
}
void
contrib_worlds.push_back(world.release());
} catch(std::exception& e) {
#ifdef DEBUG
- msg_warning("Couldn't parse levelset info for '"
- << *it << "': " << e.what() << "");
+ log_warning << "Couldn't parse levelset info for '" << *it << "': " << e.what() << std::endl;
#endif
}
}
level->get("name", name);
return name;
} catch(std::exception& e) {
- msg_warning("Problem getting name of '" << filename << "'.");
+ log_warning << "Problem getting name of '" << filename << "'." << std::endl;
return "";
}
}
if (index == -1)
return;
- World& world = * (contrib_worlds[index]);
-
- if(!world.is_levelset) {
- // TODO fade out
- world.run();
- }
-
- if (current_world != index) {
- current_world = index;
- World& world = * (contrib_worlds[index]);
-
- current_contrib_world = &world;
+ current_world = contrib_worlds[index];
+ if(!current_world->is_levelset) {
+ update_load_game_menu();
+ Menu::push_current(load_game_menu.get());
+ } else {
contrib_world_menu.reset(new Menu());
- contrib_world_menu->add_label(world.title);
+ contrib_world_menu->add_label(current_world->title);
contrib_world_menu->add_hl();
- for (unsigned int i = 0; i < world.get_num_levels(); ++i)
+ for (unsigned int i = 0; i < current_world->get_num_levels(); ++i)
{
/** get level's title */
- std::string filename = world.get_level_filename(i);
+ std::string filename = current_world->get_level_filename(i);
std::string title = get_level_name(filename);
contrib_world_menu->add_entry(i, title);
}
sound_manager->stop_music();
GameSession* session =
new GameSession(
- current_contrib_world->get_level_filename(index), ST_GL_PLAY);
+ current_world->get_level_filename(index), ST_GL_PLAY);
main_loop->push_screen(session);
}
}
controller.reset(new CodeController());
titlesession.reset(new GameSession("levels/misc/menu.stl", ST_GL_DEMO_GAME));
- // delete contrib_world_menu;
- // contrib_world_menu = new Menu();
-
- titlesession->get_current_sector()->activate("main");
- titlesession->set_current();
-
Player* player = titlesession->get_current_sector()->player;
player->set_controller(controller.get());
-
- Menu::set_current(main_menu);
}
TitleScreen::~TitleScreen()
player_status->reset();
Sector* sector = titlesession->get_current_sector();
- sector->play_music(LEVEL_MUSIC);
- sector->activate(sector->player->get_pos());
+ if(Sector::current() != sector) {
+ sector->play_music(LEVEL_MUSIC);
+ sector->activate(sector->player->get_pos());
+ }
Menu::set_current(main_menu);
}
void
+TitleScreen::leave()
+{
+ Sector* sector = titlesession->get_current_sector();
+ sector->deactivate();
+}
+
+void
TitleScreen::draw(DrawingContext& context)
{
Sector* sector = titlesession->get_current_sector();
switch (main_menu->check()) {
case MNID_STARTGAME:
// Start Game, ie. goto the slots menu
+ if(main_world.get() == NULL) {
+ main_world.reset(new World());
+ main_world->load("levels/world1/info");
+ }
+ current_world = main_world.get();
update_load_game_menu();
Menu::push_current(load_game_menu.get());
break;
main_loop->quit();
break;
}
- } else if(menu == options_menu) {
- process_options_menu();
} else if(menu == load_game_menu.get()) {
/*
if(event.key.keysym.sym == SDLK_DELETE) {
if(confirm_dialog(bkg_title, str.c_str())) {
str = "save/slot" + stream.str() + ".stsg";
- msg_debug("Removing: " << str);
+ log_debug << "Removing: " << str << std::endl;
PHYSFS_delete(str.c_str());
}
TitleScreen::get_slotinfo(int slot)
{
std::string tmp;
- std::string slotfile;
std::string title;
- std::stringstream stream;
- stream << slot;
- slotfile = "save/slot" + stream.str() + ".stsg";
+
+ 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;
savegame->get("title", title);
} catch(std::exception& e) {
- return std::string(_("Slot")) + " " + stream.str() + " - " +
- std::string(_("Free"));
+ std::ostringstream slottitle;
+ slottitle << _("Slot") << " " << slot << " - " << _("Free");
+ return slottitle.str();
}
- return std::string("Slot ") + stream.str() + " - " + title;
+ std::ostringstream slottitle;
+ slottitle << _("Slot") << " " << slot << " - " << title;
+ return slottitle.str();
}
bool
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 << slot;
- std::string slotfile = "save/slot" + stream.str() + ".stsg";
+ stream << "save/" << worlddirname << "_" << slot << ".stsg";
+ std::string slotfile = stream.str();
- sound_manager->stop_music();
fadeout(256);
- DrawingContext context;
- context.draw_text(white_text, "Loading...",
- Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT/2),
- CENTER_ALLIGN, LAYER_FOREGROUND1);
- context.do_drawing();
-
- WorldMapNS::WorldMap* worldmap = new WorldMapNS::WorldMap();
- worldmap->set_map_filename("/levels/world1/worldmap.stwm");
- // Load the game or at least set the savegame_file variable
- worldmap->loadgame(slotfile);
-
- main_loop->push_screen(worldmap);
-
- //Menu::set_current(main_menu);
+ try {
+ current_world->set_savegame_filename(slotfile);
+ current_world->run();
+ } catch(std::exception& e) {
+ log_fatal << "Couldn't start world: " << e.what() << std::endl;
+ }
return true;
}