#include <version.h>
#include <SDL_image.h>
-#include <physfs.h>
-#include <iostream>
-#include <binreloc.h>
-#include <tinygettext/log.hpp>
#include <boost/format.hpp>
+#include <boost/optional.hpp>
+#include <iostream>
+#include <physfs.h>
#include <stdio.h>
+#include <tinygettext/log.hpp>
extern "C" {
#include <findlocale.h>
}
#include "physfs/physfs_file_system.hpp"
#include "physfs/physfs_sdl.hpp"
#include "scripting/squirrel_util.hpp"
+#include "scripting/scripting.hpp"
#include "sprite/sprite_manager.hpp"
#include "supertux/command_line_arguments.hpp"
#include "supertux/game_manager.hpp"
#include "video/renderer.hpp"
#include "worldmap/worldmap.hpp"
-void
-Main::init_config()
+class ConfigSubsystem
{
- g_config.reset(new Config);
- try {
- g_config->load();
- } catch(const std::exception& e) {
- log_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl;
+public:
+ ConfigSubsystem()
+ {
+ g_config.reset(new Config);
+ try {
+ g_config->load();
+ }
+ catch(const std::exception& e)
+ {
+ log_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl;
+ }
+
+ // init random number stuff
+ g_config->random_seed = gameRandom.srand(g_config->random_seed);
+ graphicsRandom.srand(0);
+ //const char *how = config->random_seed? ", user fixed.": ", from time().";
+ //log_info << "Using random seed " << config->random_seed << how << std::endl;
}
-}
+
+ ~ConfigSubsystem()
+ {
+ if (g_config)
+ {
+ g_config->save();
+ }
+ g_config.reset();
+ }
+};
void
Main::init_tinygettext()
if (g_config->locale != "")
{
g_dictionary_manager->set_language(tinygettext::Language::from_name(g_config->locale));
- } else {
+ }
+ else
+ {
FL_Locale *locale;
FL_FindLocale(&locale);
tinygettext::Language language = tinygettext::Language::from_spec( locale->lang?locale->lang:"", locale->country?locale->country:"", locale->variant?locale->variant:"");
}
}
-void
-Main::init_physfs(const char* argv0)
+class PhysfsSubsystem
{
- if(!PHYSFS_init(argv0)) {
- std::stringstream msg;
- msg << "Couldn't initialize physfs: " << PHYSFS_getLastError();
- throw std::runtime_error(msg.str());
- }
-
- // allow symbolic links
- PHYSFS_permitSymbolicLinks(1);
-
- // Initialize physfs (this is a slightly modified version of
- // PHYSFS_setSaneConfig)
- const char *env_writedir;
- std::string writedir;
-
- if ((env_writedir = getenv("SUPERTUX2_USER_DIR")) != NULL) {
- writedir = env_writedir;
- if(!PHYSFS_setWriteDir(writedir.c_str())) {
- std::ostringstream msg;
- msg << "Failed to use configuration directory '"
- << writedir << "': " << PHYSFS_getLastError();
+private:
+ boost::optional<std::string> m_forced_datadir;
+ boost::optional<std::string> m_forced_userdir;
+
+public:
+ PhysfsSubsystem(const char* argv0,
+ boost::optional<std::string> forced_datadir,
+ boost::optional<std::string> forced_userdir) :
+ m_forced_datadir(forced_datadir),
+ m_forced_userdir(forced_userdir)
+ {
+ if (!PHYSFS_init(argv0))
+ {
+ std::stringstream msg;
+ msg << "Couldn't initialize physfs: " << PHYSFS_getLastError();
throw std::runtime_error(msg.str());
}
+ else
+ {
+ // allow symbolic links
+ PHYSFS_permitSymbolicLinks(1);
- } else {
- std::string userdir = PHYSFS_getUserDir();
-
- // Set configuration directory
- writedir = userdir + WRITEDIR_NAME;
- if(!PHYSFS_setWriteDir(writedir.c_str())) {
- // try to create the directory
- if(!PHYSFS_setWriteDir(userdir.c_str()) || !PHYSFS_mkdir(WRITEDIR_NAME)) {
- std::ostringstream msg;
- msg << "Failed creating configuration directory '"
- << writedir << "': " << PHYSFS_getLastError();
- throw std::runtime_error(msg.str());
- }
+ find_userdir();
+ find_datadir();
+ }
+ }
- if(!PHYSFS_setWriteDir(writedir.c_str())) {
- std::ostringstream msg;
- msg << "Failed to use configuration directory '"
- << writedir << "': " << PHYSFS_getLastError();
- throw std::runtime_error(msg.str());
+ void find_datadir()
+ {
+ std::string datadir;
+ if (m_forced_datadir)
+ {
+ datadir = *m_forced_datadir;
+ }
+ else if (const char* env_datadir = getenv("SUPERTUX2_DATA_DIR"))
+ {
+ datadir = env_datadir;
+ }
+ else
+ {
+ // check if we run from source dir
+ char* basepath_c = SDL_GetBasePath();
+ std::string basepath = basepath_c;
+ SDL_free(basepath_c);
+
+ datadir = FileSystem::join(basepath, "data");
+ std::string testfname = FileSystem::join(datadir, "credits.txt");
+ if (!FileSystem::exists(testfname))
+ {
+ // if the game is not run from the source directory, try to find
+ // the global install location
+ datadir = datadir.substr(0, datadir.rfind(INSTALL_SUBDIR_BIN));
+ datadir = FileSystem::join(datadir, INSTALL_SUBDIR_SHARE);
}
}
- }
- PHYSFS_addToSearchPath(writedir.c_str(), 0);
-
- // when started from source dir...
- char* base_path = SDL_GetBasePath();
- std::string dir = base_path;
- SDL_free(base_path);
-
- if (dir[dir.length() - 1] != '/')
- dir += "/";
- dir += "data";
- std::string testfname = dir;
- testfname += "/credits.txt";
- bool sourcedir = false;
- FILE* f = fopen(testfname.c_str(), "r");
- if(f) {
- fclose(f);
- if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) {
- log_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
- } else {
- sourcedir = true;
+
+ if (!PHYSFS_addToSearchPath(datadir.c_str(), 1))
+ {
+ log_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
}
}
- if(!sourcedir) {
- std::string datadir = PHYSFS_getBaseDir();
- datadir = datadir.substr(0, datadir.rfind(INSTALL_SUBDIR_BIN));
- datadir += "/" INSTALL_SUBDIR_SHARE;
-#ifdef ENABLE_BINRELOC
+ void find_userdir()
+ {
+ std::string userdir;
+ if (m_forced_userdir)
+ {
+ userdir = *m_forced_userdir;
+ }
+ else if (const char* env_userdir = getenv("SUPERTUX2_USER_DIR"))
+ {
+ userdir = env_userdir;
+ }
+ else
+ {
+ std::string physfs_userdir = PHYSFS_getUserDir();
+#ifdef _WIN32
+ userdir = FileSystem::join(physfs_userdir, PACKAGE_NAME);
+#else
+ userdir = FileSystem::join(physfs_userdir, "." PACKAGE_NAME);
+#endif
+ }
- char* dir;
- br_init (NULL);
- dir = br_find_data_dir(datadir.c_str());
- datadir = dir;
- free(dir);
+ if (!FileSystem::is_directory(userdir))
+ {
+ FileSystem::mkdir(userdir);
+ log_info << "Created SuperTux userdir: " << userdir << std::endl;
+ }
-#endif
- if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) {
- log_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
+ if (!PHYSFS_setWriteDir(userdir.c_str()))
+ {
+ std::ostringstream msg;
+ msg << "Failed to use userdir directory '"
+ << userdir << "': " << PHYSFS_getLastError();
+ throw std::runtime_error(msg.str());
}
+
+ PHYSFS_addToSearchPath(userdir.c_str(), 0);
}
- //show search Path
- char** searchpath = PHYSFS_getSearchPath();
- for(char** i = searchpath; *i != NULL; i++)
- log_info << "[" << *i << "] is in the search path" << std::endl;
- PHYSFS_freeList(searchpath);
-}
+ void print_search_path()
+ {
+ const char* writedir = PHYSFS_getWriteDir();
+ log_info << "PhysfsWritedDir: " << (writedir ? writedir : "(null)") << std::endl;
+ log_info << "PhysfsSearchPath:" << std::endl;
+ char** searchpath = PHYSFS_getSearchPath();
+ for(char** i = searchpath; *i != NULL; ++i)
+ {
+ log_info << " " << *i << std::endl;
+ }
+ PHYSFS_freeList(searchpath);
+ }
-void
-Main::init_sdl()
-{
- if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) < 0) {
- std::stringstream msg;
- msg << "Couldn't initialize SDL: " << SDL_GetError();
- throw std::runtime_error(msg.str());
+ ~PhysfsSubsystem()
+ {
+ PHYSFS_deinit();
}
- // just to be sure
- atexit(SDL_Quit);
-}
+};
-void
-Main::init_rand()
+class SDLSubsystem
{
- g_config->random_seed = gameRandom.srand(g_config->random_seed);
-
- graphicsRandom.srand(0);
+public:
+ SDLSubsystem()
+ {
+ if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) < 0)
+ {
+ std::stringstream msg;
+ msg << "Couldn't initialize SDL: " << SDL_GetError();
+ throw std::runtime_error(msg.str());
+ }
+ // just to be sure
+ atexit(SDL_Quit);
+ }
- //const char *how = config->random_seed? ", user fixed.": ", from time().";
- //log_info << "Using random seed " << config->random_seed << how << std::endl;
-}
+ ~SDLSubsystem()
+ {
+ SDL_Quit();
+ }
+};
void
Main::init_video()
last_timelog_component = component;
}
+void
+Main::launch_game()
+{
+ SDLSubsystem sdl_subsystem;
+ ConsoleBuffer console_buffer;
+
+ timelog("controller");
+ InputManager input_manager(g_config->keyboard_config, g_config->joystick_config);
+
+ timelog("commandline");
+
+ timelog("video");
+ std::unique_ptr<VideoSystem> video_system = VideoSystem::create(g_config->video);
+ DrawingContext context(*video_system);
+ init_video();
+
+ timelog("audio");
+ SoundManager sound_manager;
+ sound_manager.enable_sound(g_config->sound_enabled);
+ sound_manager.enable_music(g_config->music_enabled);
+
+ Console console(console_buffer);
+
+ timelog("scripting");
+ scripting::Scripting scripting(g_config->enable_script_debugger);
+
+ timelog("resources");
+ TileManager tile_manager;
+ SpriteManager sprite_manager;
+ Resources resources;
+
+ timelog("addons");
+ AddonManager addon_manager("addons", g_config->addons);
+
+ timelog(0);
+
+ const std::unique_ptr<Savegame> default_savegame(new Savegame(std::string()));
+
+ GameManager game_manager;
+ ScreenManager screen_manager;
+
+ if(g_config->start_level != "") {
+ // we have a normal path specified at commandline, not a physfs path.
+ // So we simply mount that path here...
+ std::string dir = FileSystem::dirname(g_config->start_level);
+ std::string fileProtocol = "file://";
+ std::string::size_type position = dir.find(fileProtocol);
+ if(position != std::string::npos) {
+ dir = dir.replace(position, fileProtocol.length(), "");
+ }
+ log_debug << "Adding dir: " << dir << std::endl;
+ PHYSFS_addToSearchPath(dir.c_str(), true);
+
+ if(g_config->start_level.size() > 4 &&
+ g_config->start_level.compare(g_config->start_level.size() - 5, 5, ".stwm") == 0)
+ {
+ screen_manager.push_screen(std::unique_ptr<Screen>(
+ new worldmap::WorldMap(
+ FileSystem::basename(g_config->start_level), *default_savegame)));
+ } else {
+ std::unique_ptr<GameSession> session (
+ new GameSession(FileSystem::basename(g_config->start_level), *default_savegame));
+
+ g_config->random_seed = session->get_demo_random_seed(g_config->start_demo);
+ g_config->random_seed = gameRandom.srand(g_config->random_seed);
+ graphicsRandom.srand(0);
+
+ if(g_config->start_demo != "")
+ session->play_demo(g_config->start_demo);
+
+ if(g_config->record_demo != "")
+ session->record_demo(g_config->record_demo);
+ screen_manager.push_screen(std::move(session));
+ }
+ } else {
+ screen_manager.push_screen(std::unique_ptr<Screen>(new TitleScreen(*default_savegame)));
+ }
+
+ screen_manager.run(context);
+}
+
int
Main::run(int argc, char** argv)
{
{
CommandLineArguments args;
- // Do this before pre_parse_commandline, because --help now shows the
- // default user data dir.
- init_physfs(argv[0]);
-
try
{
args.parse_args(argc, argv);
}
catch(const std::exception& err)
{
- try
- {
- init_config();
- args.merge_into(*g_config);
- init_tinygettext();
- }
- catch(const std::exception& err_)
- {
- log_fatal << "failed to init config or tinygettext: " << err_.what() << std::endl;
- }
-
std::cout << "Error: " << err.what() << std::endl;
return EXIT_FAILURE;
}
+ PhysfsSubsystem physfs_subsystem(argv[0], args.datadir, args.userdir);
+ physfs_subsystem.print_search_path();
+
timelog("config");
- init_config();
+ ConfigSubsystem config_subsystem;
args.merge_into(*g_config);
timelog("tinygettext");
return 0;
default:
- // continue and start the game as usual
+ launch_game();
break;
}
-
- init_sdl();
- //ConsoleBuffer console_buffer;
-
- timelog("controller");
- InputManager input_manager;
-
- timelog("commandline");
-
- timelog("video");
- std::unique_ptr<VideoSystem> video_system = VideoSystem::create(g_config->video);
- DrawingContext context(video_system->get_renderer(),
- video_system->get_lightmap());
- init_video();
-
- timelog("audio");
- SoundManager sound_manager;
- sound_manager.enable_sound(g_config->sound_enabled);
- sound_manager.enable_music(g_config->music_enabled);
-
- Console console;
-
- timelog("scripting");
- scripting::init_squirrel(g_config->enable_script_debugger);
-
- timelog("resources");
- TileManager tile_manager;
- SpriteManager sprite_manager;
- Resources resources;
-
- timelog("addons");
- AddonManager::get_instance().load_addons();
-
- timelog(0);
-
- const std::unique_ptr<Savegame> default_savegame(new Savegame(std::string()));
-
- GameManager game_manager;
- ScreenManager screen_manager;
-
- init_rand();
-
- if(g_config->start_level != "") {
- // we have a normal path specified at commandline, not a physfs path.
- // So we simply mount that path here...
- std::string dir = FileSystem::dirname(g_config->start_level);
- std::string fileProtocol = "file://";
- std::string::size_type position = dir.find(fileProtocol);
- if(position != std::string::npos) {
- dir = dir.replace(position, fileProtocol.length(), "");
- }
- log_debug << "Adding dir: " << dir << std::endl;
- PHYSFS_addToSearchPath(dir.c_str(), true);
-
- if(g_config->start_level.size() > 4 &&
- g_config->start_level.compare(g_config->start_level.size() - 5, 5, ".stwm") == 0) {
- ScreenManager::current()->push_screen(std::unique_ptr<Screen>(
- new worldmap::WorldMap(
- FileSystem::basename(g_config->start_level), *default_savegame)));
- } else {
- std::unique_ptr<GameSession> session (
- new GameSession(FileSystem::basename(g_config->start_level), *default_savegame));
-
- g_config->random_seed =session->get_demo_random_seed(g_config->start_demo);
- init_rand();//initialise generator with seed from session
-
- if(g_config->start_demo != "")
- session->play_demo(g_config->start_demo);
-
- if(g_config->record_demo != "")
- session->record_demo(g_config->record_demo);
- ScreenManager::current()->push_screen(std::move(session));
- }
- } else {
- ScreenManager::current()->push_screen(std::unique_ptr<Screen>(new TitleScreen(*default_savegame)));
- }
-
- ScreenManager::current()->run(context);
- } catch(std::exception& e) {
+ }
+ catch(const std::exception& e)
+ {
log_fatal << "Unexpected exception: " << e.what() << std::endl;
result = 1;
- } catch(...) {
+ }
+ catch(...)
+ {
log_fatal << "Unexpected exception" << std::endl;
result = 1;
}
- if(g_config)
- g_config->save();
- g_config.reset();
-
- scripting::exit_squirrel();
-
- SDL_Quit();
- PHYSFS_deinit();
-
g_dictionary_manager.reset();
return result;
projects / supertux.git / blobdiff