#include <assert.h>
#include <unistd.h>
-
#include "app/setup.h"
#include "level.h"
#include "app/globals.h"
// Check in which directory our subset is located (ie. ~/.supertux/
// or SUPERTUX_DATADIR)
- char filename[1024];
- snprintf(filename, 1024, "%s/levels/%s/", st_dir, subset);
- if (access(filename, R_OK) == 0)
+ std::string filename;
+ filename = st_dir + "/levels/" + subset + "/";
+ if (access(filename.c_str(), R_OK) == 0)
{
directory = filename;
}
else
{
- snprintf(filename, 1024, "%s/levels/%s/", datadir.c_str(), subset);
- if (access(filename, R_OK) == 0)
+ filename = datadir + "/levels/" + subset + "/";
+ if (access(filename.c_str(), R_OK) == 0)
directory = filename;
else
std::cout << "Error: LevelSubset: couldn't find subset: " << subset << std::endl;
if (levels.empty())
{ // Level info file doesn't define any levels, so read the
// directory to see what we can find
- std::vector<std::string> files;
+ std::set<std::string> files;
- snprintf(filename, 1024, "%s/levels/%s/", st_dir, subset);
- if(access(filename, R_OK) == 0)
+ filename = st_dir + "/levels/" + subset + "/";
+ if(access(filename.c_str(), R_OK) == 0)
{
files = FileSystem::read_directory(filename);
}
else
{
- snprintf(filename, 1024, "%s/levels/%s/", datadir.c_str(), subset);
+ filename = datadir + "/levels/" + subset + "/";
files = FileSystem::read_directory(filename);
}
- for(std::vector<std::string>::iterator i = files.begin(); i != files.end(); ++i)
+ for(std::set<std::string>::iterator i = files.begin(); i != files.end(); ++i)
{
if (has_suffix(*i, ".stl"))
levels.push_back(*i);