#include <cctype>
#include "../app/globals.h"
-#include "../app/defines.h"
#include "../app/setup.h"
#include "../video/screen.h"
#include "../video/surface.h"
void usage(char * prog, int ret);
/* Does the given file exist and is it accessible? */
-int FileSystem::faccessible(const char *filename)
+int FileSystem::faccessible(const std::string& filename)
{
struct stat filestat;
- if (stat(filename, &filestat) == -1)
+ if (stat(filename.c_str(), &filestat) == -1)
{
return false;
}
}
/* Can we write to this location? */
-int FileSystem::fwriteable(const char *filename)
+int FileSystem::fwriteable(const std::string& filename)
{
FILE* fi;
- fi = fopen(filename, "wa");
+ fi = fopen(filename.c_str(), "wa");
if (fi == NULL)
{
return false;
}
/* Makes sure a directory is created in either the SuperTux home directory or the SuperTux base directory.*/
-int FileSystem::fcreatedir(const char* relative_dir)
+int FileSystem::fcreatedir(const std::string& relative_dir)
{
- char path[1024];
- snprintf(path, 1024, "%s/%s/", st_dir, relative_dir);
- if(mkdir(path,0755) != 0)
+ std::string path = st_dir + "/" + relative_dir + "/";
+ if(mkdir(path.c_str(),0755) != 0)
{
- snprintf(path, 1024, "%s/%s/", datadir.c_str(), relative_dir);
- if(mkdir(path,0755) != 0)
+ path = datadir + "/" + relative_dir + "/";
+ if(mkdir(path.c_str(),0755) != 0)
{
return false;
}
/* Get all names of sub-directories in a certain directory. */
/* Returns the number of sub-directories found. */
/* Note: The user has to free the allocated space. */
-string_list_type FileSystem::dsubdirs(const char *rel_path,const char* expected_file)
+std::set<std::string> FileSystem::dsubdirs(const std::string &rel_path,const std::string& expected_file)
{
DIR *dirStructP;
struct dirent *direntp;
- string_list_type sdirs;
- char filename[1024];
- char path[1024];
+ std::set<std::string> sdirs;
+ std::string filename;
+ std::string path = st_dir + "/" + rel_path;
- string_list_init(&sdirs);
- sprintf(path,"%s/%s",st_dir,rel_path);
- if((dirStructP = opendir(path)) != NULL)
+ if((dirStructP = opendir(path.c_str())) != NULL)
{
while((direntp = readdir(dirStructP)) != NULL)
{
- char absolute_filename[1024];
+ std::string absolute_filename;
struct stat buf;
- sprintf(absolute_filename, "%s/%s", path, direntp->d_name);
+ absolute_filename = path + "/" + direntp->d_name;
- if (stat(absolute_filename, &buf) == 0 && S_ISDIR(buf.st_mode))
+ if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISDIR(buf.st_mode))
{
- if(expected_file != NULL)
+ if(!expected_file.empty())
{
- sprintf(filename,"%s/%s/%s",path,direntp->d_name,expected_file);
+ filename = path + "/" + direntp->d_name + "/" + expected_file;
if(!faccessible(filename))
continue;
}
- string_list_add_item(&sdirs,direntp->d_name);
+ sdirs.insert(direntp->d_name);
}
}
closedir(dirStructP);
}
- sprintf(path,"%s/%s",datadir.c_str(),rel_path);
- if((dirStructP = opendir(path)) != NULL)
+ path = datadir + "/" + rel_path;
+ if((dirStructP = opendir(path.c_str())) != NULL)
{
while((direntp = readdir(dirStructP)) != NULL)
{
- char absolute_filename[1024];
+ std::string absolute_filename;
struct stat buf;
- sprintf(absolute_filename, "%s/%s", path, direntp->d_name);
+ absolute_filename = path + "/" + direntp->d_name;
- if (stat(absolute_filename, &buf) == 0 && S_ISDIR(buf.st_mode))
+ if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISDIR(buf.st_mode))
{
- if(expected_file != NULL)
+ if(!expected_file.empty())
{
- sprintf(filename,"%s/%s/%s",path,direntp->d_name,expected_file);
- if(!faccessible(filename))
+ filename = path + "/" + direntp->d_name + "/" + expected_file;
+ if(!faccessible(filename.c_str()))
{
continue;
}
else
{
- sprintf(filename,"%s/%s/%s/%s",st_dir,rel_path,direntp->d_name,expected_file);
- if(faccessible(filename))
+ filename = st_dir + "/" + rel_path + "/" + direntp->d_name + "/" + expected_file;
+ if(faccessible(filename.c_str()))
continue;
}
}
- string_list_add_item(&sdirs,direntp->d_name);
+ sdirs.insert(direntp->d_name);
}
}
closedir(dirStructP);
return sdirs;
}
-string_list_type FileSystem::dfiles(const char *rel_path, const char* glob, const char* exception_str)
+std::set<std::string> FileSystem::dfiles(const std::string& rel_path, const std::string& glob, const std::string& exception_str)
{
DIR *dirStructP;
struct dirent *direntp;
- string_list_type sdirs;
- char path[1024];
+ std::set<std::string> sdirs;
+ std::string path = st_dir + "/" + rel_path;
- string_list_init(&sdirs);
- sprintf(path,"%s/%s",st_dir,rel_path);
- if((dirStructP = opendir(path)) != NULL)
+ if((dirStructP = opendir(path.c_str())) != NULL)
{
while((direntp = readdir(dirStructP)) != NULL)
{
- char absolute_filename[1024];
+ std::string absolute_filename;
struct stat buf;
- sprintf(absolute_filename, "%s/%s", path, direntp->d_name);
+ absolute_filename = path + "/" + direntp->d_name;
- if (stat(absolute_filename, &buf) == 0 && S_ISREG(buf.st_mode))
+ if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISREG(buf.st_mode))
{
- if(exception_str != NULL)
+ if(!exception_str.empty())
{
- if(strstr(direntp->d_name,exception_str) != NULL)
+ if(strstr(direntp->d_name,exception_str.c_str()) != NULL)
continue;
}
- if(glob != NULL)
- if(strstr(direntp->d_name,glob) == NULL)
+ if(!glob.empty())
+ if(strstr(direntp->d_name,glob.c_str()) == NULL)
continue;
- string_list_add_item(&sdirs,direntp->d_name);
+ sdirs.insert(direntp->d_name);
}
}
closedir(dirStructP);
}
- sprintf(path,"%s/%s",datadir.c_str(),rel_path);
- if((dirStructP = opendir(path)) != NULL)
+ path = datadir + "/" + rel_path;
+ if((dirStructP = opendir(path.c_str())) != NULL)
{
while((direntp = readdir(dirStructP)) != NULL)
{
- char absolute_filename[1024];
+ std::string absolute_filename;
struct stat buf;
- sprintf(absolute_filename, "%s/%s", path, direntp->d_name);
+ absolute_filename = path + "/" + direntp->d_name;
- if (stat(absolute_filename, &buf) == 0 && S_ISREG(buf.st_mode))
+ if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISREG(buf.st_mode))
{
- if(exception_str != NULL)
+ if(!exception_str.empty())
{
- if(strstr(direntp->d_name,exception_str) != NULL)
+ if(strstr(direntp->d_name,exception_str.c_str()) != NULL)
continue;
}
- if(glob != NULL)
- if(strstr(direntp->d_name,glob) == NULL)
+ if(!glob.empty())
+ if(strstr(direntp->d_name,glob.c_str()) == NULL)
continue;
- string_list_add_item(&sdirs,direntp->d_name);
+ sdirs.insert(direntp->d_name);
}
}
closedir(dirStructP);
/* Set SuperTux configuration and save directories */
void Setup::directories(void)
{
- char *home;
- char str[1024];
+ std::string home;
/* Get home directory (from $HOME variable)... if we can't determine it,
use the current directory ("."): */
if (getenv("HOME") != NULL)
else
home = ".";
- std::string st_dir_tmp = "/." + package_symbol_name;
- st_dir = (char *) malloc(sizeof(char) * (strlen(home) +
- strlen(st_dir_tmp.c_str()) + 1));
- strcpy(st_dir, home);
- strcat(st_dir,st_dir_tmp.c_str());
+ st_dir = home + "/." + package_symbol_name;
/* Remove .supertux config-file from old SuperTux versions */
if(FileSystem::faccessible(st_dir))
{
- remove
- (st_dir);
+ remove(st_dir.c_str());
}
- st_save_dir = (char *) malloc(sizeof(char) * (strlen(st_dir) + strlen("/save") + 1));
-
- strcpy(st_save_dir,st_dir);
- strcat(st_save_dir,"/save");
+ st_save_dir = st_dir + "/save";
/* Create them. In the case they exist they won't destroy anything. */
- mkdir(st_dir, 0755);
- mkdir(st_save_dir, 0755);
+ mkdir(st_dir.c_str(), 0755);
+ mkdir(st_save_dir.c_str(), 0755);
- sprintf(str, "%s/levels", st_dir);
- mkdir(str, 0755);
+ mkdir((st_dir + "/levels").c_str(), 0755);
// User has not that a datadir, so we try some magic
if (datadir.empty())
}
else
{
- std::string exedir = std::string(dirname(exe_file)) + "/";
-
+ std::string exedir = std::string(dirname(exe_file)) + "/";
+
datadir = exedir + "../data"; // SuperTux run from source dir
if (access(datadir.c_str(), F_OK) != 0)
{
+ datadir = exedir + "../../data"; //SuperTux run from source dir (with libtool script)
+
+ if (access(datadir.c_str(), F_OK) != 0)
+ {
datadir = exedir + "../share/" + package_symbol_name; // SuperTux run from PATH
if (access(datadir.c_str(), F_OK) != 0)
{ // If all fails, fall back to compiled path
datadir = DATA_PREFIX;
}
+ }
}
}
#else
SDL_EnableUNICODE(1);
- /* Load global images: */
- gold_text = new Font(datadir + "/images/fonts/gold.png", Font::TEXT, 16,18);
- blue_text = new Font(datadir + "/images/fonts/blue.png", Font::TEXT, 16,18,3);
- white_text = new Font(datadir + "/images/fonts/white.png",
- Font::TEXT, 16,18);
- gray_text = new Font(datadir + "/images/fonts/gray.png",
- Font::TEXT, 16,18);
- white_small_text = new Font(datadir + "/images/fonts/white-small.png",
- Font::TEXT, 8,9, 1);
- white_big_text = new Font(datadir + "/images/fonts/white-big.png",
- Font::TEXT, 20,22, 3);
- yellow_nums = new Font(datadir + "/images/fonts/numbers.png",
- Font::NUM, 32,32);
-
/* Load GUI/menu images: */
checkbox = new Surface(datadir + "/images/status/checkbox.png", true);
checkbox_checked = new Surface(datadir + "/images/status/checkbox-checked.png", true);
void Setup::general_free(void)
{
- /* Free global images: */
- delete gold_text;
- delete white_text;
- delete blue_text;
- delete gray_text;
- delete white_small_text;
- delete white_big_text;
- delete yellow_nums;
-
/* Free GUI/menu images: */
delete checkbox;
delete checkbox_checked;
void Termination::shutdown(void)
{
+ config->save();
SoundManager::get()->close_audio();
SDL_Quit();
- config->save();
}
/* --- ABORT! --- */
{
launch_worldmap_mode = true;
}
+ else if (strcmp(argv[i], "--flip-levels") == 0)
+ {
+ flip_levels_mode = true;
+ }
else if (strcmp(argv[i], "--datadir") == 0
|| strcmp(argv[i], "-d") == 0 )
{
else if (strcmp(argv[i], "--version") == 0)
{
/* Show version: */
- printf((package_name + package_version + "\n").c_str() );
+ printf((package_name + " " + package_version + "\n").c_str() );
exit(0);
}
else if (strcmp(argv[i], "--disable-sound") == 0)
}
else if (strcmp(argv[i], "--help") == 0)
{ /* Show help: */
- puts(_(" SuperTux " VERSION "\n"
- " Please see the file \"README.txt\" for more details.\n"));
+ puts(_((" SuperTux " + package_version + "\n"
+ " Please see the file \"README.txt\" for more details.\n").c_str()));
printf(_("Usage: %s [OPTIONS] FILENAME\n\n"), argv[0]);
puts(_("Display Options:\n"
" -f, --fullscreen Run in fullscreen mode.\n"
" Define how joystick buttons and axis should be mapped\n"
" --leveleditor Opens the leveleditor in a file.\n"
" --worldmap Opens the specified worldmap file.\n"
+ " --flip-levels Flip levels upside-down.\n"
" -d, --datadir DIR Load Game data from DIR (default: automatic)\n"
" --debug Enables the debug mode, which is useful for developers.\n"
" --help Display a help message summarizing command-line\n"
/* Display the usage message: */
- fprintf(fi, _("Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] FILENAME\n"),
+ fprintf(fi, _("Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] [--flip-levels] FILENAME\n"),
prog);
exit(ret);
}
-std::vector<std::string> FileSystem::read_directory(const std::string& pathname)
+std::set<std::string> FileSystem::read_directory(const std::string& pathname)
{
- std::vector<std::string> dirnames;
+ std::set<std::string> dirnames;
DIR* dir = opendir(pathname.c_str());
if (dir)
while((direntp = readdir(dir)))
{
- dirnames.push_back(direntp->d_name);
+ dirnames.insert(direntp->d_name);
}
closedir(dir);
projects / supertux.git / blobdiff