projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uploading the level editor I was working on - It isn't still usable, but it was only...
[supertux.git]
/
src
/
level_subset.cpp
diff --git
a/src/level_subset.cpp
b/src/level_subset.cpp
index
25785d1
..
5cd4d2a
100644
(file)
--- a/
src/level_subset.cpp
+++ b/
src/level_subset.cpp
@@
-19,12
+19,15
@@
// 02111-1307, USA.
#include <assert.h>
// 02111-1307, USA.
#include <assert.h>
-#include "setup.h"
+#include <unistd.h>
+#include "app/setup.h"
#include "level.h"
#include "level.h"
-#include "globals.h"
-#include "
screen
/surface.h"
+#include "
app/
globals.h"
+#include "
video
/surface.h"
#include "level_subset.h"
#include "level_subset.h"
+using namespace SuperTux;
+
static bool has_suffix(const std::string& data, const std::string& suffix)
{
if (data.length() >= suffix.length())
static bool has_suffix(const std::string& data, const std::string& suffix)
{
if (data.length() >= suffix.length())
@@
-61,8
+64,8
@@
void LevelSubset::read_info_file(const std::string& info_file)
{
LispReader reader(lisp_cdr(root_obj));
{
LispReader reader(lisp_cdr(root_obj));
- reader.read_string("title", title);
- reader.read_string("description", description);
+ reader.read_string("title", title
, true
);
+ reader.read_string("description", description
, true
);
reader.read_string_vector("levels", levels);
}
else
reader.read_string_vector("levels", levels);
}
else
@@
-73,22
+76,22
@@
void LevelSubset::read_info_file(const std::string& info_file)
lisp_free(root_obj);
}
lisp_free(root_obj);
}
-void LevelSubset::load(const
char*
subset)
+void LevelSubset::load(const
std::string&
subset)
{
name = subset;
// Check in which directory our subset is located (ie. ~/.supertux/
// or SUPERTUX_DATADIR)
{
name = subset;
// 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
{
{
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;
directory = filename;
else
std::cout << "Error: LevelSubset: couldn't find subset: " << subset << std::endl;
@@
-99,20
+102,20
@@
void LevelSubset::load(const char* subset)
if (levels.empty())
{ // Level info file doesn't define any levels, so read the
// directory to see what we can find
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 = read_directory(filename);
+ files =
FileSystem::
read_directory(filename);
}
else
{
}
else
{
-
snprintf(filename, 1024, "%s/levels/%s/", datadir.c_str(), subset)
;
- files = read_directory(filename);
+
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);
{
if (has_suffix(*i, ".stl"))
levels.push_back(*i);
@@
-129,11
+132,11
@@
LevelSubset::save()
/* Save data file: */
filename = "/levels/" + name + "/";
/* Save data file: */
filename = "/levels/" + name + "/";
- fcreatedir(filename.c_str());
+
FileSystem::
fcreatedir(filename.c_str());
filename = std::string(st_dir) + "/levels/" + name + "/info";
filename = std::string(st_dir) + "/levels/" + name + "/info";
- if(!fwriteable(filename.c_str()))
+ if(!
FileSystem::
fwriteable(filename.c_str()))
filename = datadir + "/levels/" + name + "/info";
filename = datadir + "/levels/" + name + "/info";
- if(fwriteable(filename.c_str()))
+ if(
FileSystem::
fwriteable(filename.c_str()))
{
fi = fopen(filename.c_str(), "w");
if (fi == NULL)
{
fi = fopen(filename.c_str(), "w");
if (fi == NULL)
@@
-167,6
+170,7
@@
LevelSubset::get_level_filename(unsigned int num)
{
assert(num < levels.size());
{
assert(num < levels.size());
+std::cerr << "levels[" << num << "]: " << levels[num] << std::endl;
return directory + levels[num];
}
return directory + levels[num];
}