projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bkgd_speed. Objects properties can be edited now.
[supertux.git]
/
src
/
level.cpp
diff --git
a/src/level.cpp
b/src/level.cpp
index
cbda1f5
..
8ba49b1
100644
(file)
--- a/
src/level.cpp
+++ b/
src/level.cpp
@@
-43,7
+43,7
@@
LevelSubset::LevelSubset()
LevelSubset::~LevelSubset()
{
LevelSubset::~LevelSubset()
{
-
delete image;
+ delete image;
}
void LevelSubset::create(const std::string& subset_name)
}
void LevelSubset::create(const std::string& subset_name)
@@
-55,7
+55,7
@@
void LevelSubset::create(const std::string& subset_name)
new_subset.description = "No description so far.";
new_subset.save();
new_lev.init_defaults();
new_subset.description = "No description so far.";
new_subset.save();
new_lev.init_defaults();
- new_lev.save(subset_name
.c_str(),
1);
+ new_lev.save(subset_name
,
1);
}
void LevelSubset::parse (lisp_object_t* cursor)
}
void LevelSubset::parse (lisp_object_t* cursor)
@@
-138,11
+138,13
@@
void LevelSubset::load(char *subset)
snprintf(str, 1024, "%s.png", filename);
if(faccessible(str))
{
snprintf(str, 1024, "%s.png", filename);
if(faccessible(str))
{
+ delete image;
image = new Surface(str,IGNORE_ALPHA);
}
else
{
snprintf(filename, 1024, "%s/images/status/level-subset-info.png", datadir.c_str());
image = new Surface(str,IGNORE_ALPHA);
}
else
{
snprintf(filename, 1024, "%s/images/status/level-subset-info.png", datadir.c_str());
+ delete image;
image = new Surface(filename,IGNORE_ALPHA);
}
}
image = new Surface(filename,IGNORE_ALPHA);
}
}
@@
-219,7
+221,7
@@
Level::Level(const std::string& filename)
Level::~Level()
{
Level::~Level()
{
-
free_gfx()
;
+
delete img_bkgd
;
}
void
}
void
@@
-227,7
+229,6
@@
Level::init_defaults()
{
name = "UnNamed";
author = "UnNamed";
{
name = "UnNamed";
author = "UnNamed";
- theme = "antarctica";
song_title = "Mortimers_chipdisko.mod";
bkgd_image = "arctis.png";
width = 21;
song_title = "Mortimers_chipdisko.mod";
bkgd_image = "arctis.png";
width = 21;
@@
-235,6
+236,9
@@
Level::init_defaults()
start_pos_y = 170;
time_left = 100;
gravity = 10.;
start_pos_y = 170;
time_left = 100;
gravity = 10.;
+ back_scrolling = false;
+ hor_autoscroll_speed = 0;
+ bkgd_speed = 2;
bkgd_top.red = 0;
bkgd_top.green = 0;
bkgd_top.blue = 0;
bkgd_top.red = 0;
bkgd_top.green = 0;
bkgd_top.blue = 0;
@@
-309,7
+313,17
@@
Level::load(const std::string& filename)
if(!reader.read_int("time", &time_left)) {
printf("Warning no time specified for level.\n");
}
if(!reader.read_int("time", &time_left)) {
printf("Warning no time specified for level.\n");
}
+
+ back_scrolling = false;
+ reader.read_bool("back_scrolling", &back_scrolling);
+
+ hor_autoscroll_speed = 0;
+ reader.read_float("hor_autoscroll_speed", &hor_autoscroll_speed);
+
+ bkgd_speed = 2;
+ reader.read_int("bkgd_speed", &bkgd_speed);
+
bkgd_top.red = bkgd_top.green = bkgd_top.blue = 0;
reader.read_int("bkgd_red_top", &bkgd_top.red);
reader.read_int("bkgd_green_top", &bkgd_top.green);
bkgd_top.red = bkgd_top.green = bkgd_top.blue = 0;
reader.read_int("bkgd_red_top", &bkgd_top.red);
reader.read_int("bkgd_green_top", &bkgd_top.green);
@@
-326,8
+340,6
@@
Level::load(const std::string& filename)
reader.read_string("name", &name);
author = "unknown author";
reader.read_string("author", &author);
reader.read_string("name", &name);
author = "unknown author";
reader.read_string("author", &author);
- if(!reader.read_string("theme", &theme))
- st_abort("No theme specified in level file", "");
song_title = "";
reader.read_string("music", &song_title);
bkgd_image = "";
song_title = "";
reader.read_string("music", &song_title);
bkgd_image = "";
@@
-507,17
+519,19
@@
Level::load(const std::string& filename)
/* Save data for level: */
void
/* Save data for level: */
void
-Level::save(const
char *
subset, int level)
+Level::save(const
std::string&
subset, int level)
{
char filename[1024];
char str[80];
/* Save data file: */
{
char filename[1024];
char str[80];
/* Save data file: */
- sprintf(str, "/levels/%s/", subset);
+ sprintf(str, "/levels/%s/", subset
.c_str()
);
fcreatedir(str);
fcreatedir(str);
- snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset, level);
+ snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset.c_str(),
+ level);
if(!fwriteable(filename))
if(!fwriteable(filename))
- snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset, level);
+ snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(),
+ subset.c_str(), level);
FILE * fi = fopen(filename, "w");
if (fi == NULL)
FILE * fi = fopen(filename, "w");
if (fi == NULL)
@@
-535,10
+549,10
@@
Level::save(const char * subset, int level)
fprintf(fi," (version %d)\n", 1);
fprintf(fi," (name \"%s\")\n", name.c_str());
fprintf(fi," (author \"%s\")\n", author.c_str());
fprintf(fi," (version %d)\n", 1);
fprintf(fi," (name \"%s\")\n", name.c_str());
fprintf(fi," (author \"%s\")\n", author.c_str());
- fprintf(fi," (theme \"%s\")\n", theme.c_str());
fprintf(fi," (music \"%s\")\n", song_title.c_str());
fprintf(fi," (background \"%s\")\n", bkgd_image.c_str());
fprintf(fi," (particle_system \"%s\")\n", particle_system.c_str());
fprintf(fi," (music \"%s\")\n", song_title.c_str());
fprintf(fi," (background \"%s\")\n", bkgd_image.c_str());
fprintf(fi," (particle_system \"%s\")\n", particle_system.c_str());
+ fprintf(fi," (bkgd_speed %d)\n", bkgd_speed);
fprintf(fi," (bkgd_red_top %d)\n", bkgd_top.red);
fprintf(fi," (bkgd_green_top %d)\n", bkgd_top.green);
fprintf(fi," (bkgd_blue_top %d)\n", bkgd_top.blue);
fprintf(fi," (bkgd_red_top %d)\n", bkgd_top.red);
fprintf(fi," (bkgd_green_top %d)\n", bkgd_top.green);
fprintf(fi," (bkgd_blue_top %d)\n", bkgd_top.blue);
@@
-547,6
+561,11
@@
Level::save(const char * subset, int level)
fprintf(fi," (bkgd_blue_bottom %d)\n", bkgd_bottom.blue);
fprintf(fi," (time %d)\n", time_left);
fprintf(fi," (width %d)\n", width);
fprintf(fi," (bkgd_blue_bottom %d)\n", bkgd_bottom.blue);
fprintf(fi," (time %d)\n", time_left);
fprintf(fi," (width %d)\n", width);
+ if(back_scrolling)
+ fprintf(fi," (back_scrolling #t)\n");
+ else
+ fprintf(fi," (back_scrolling #f)\n");
+ fprintf(fi," (hor_autoscroll_speed %2.1f)\n", hor_autoscroll_speed);
fprintf(fi," (gravity %2.1f)\n", gravity);
fprintf(fi," (background-tm ");
fprintf(fi," (gravity %2.1f)\n", gravity);
fprintf(fi," (background-tm ");
@@
-612,11
+631,10
@@
Level::cleanup()
}
reset_points.clear();
}
reset_points.clear();
- name.clear();
- author.clear();
- theme.clear();
- song_title.clear();
- bkgd_image.clear();
+ name = "";
+ author = "";
+ song_title = "";
+ bkgd_image = "";
badguy_data.clear();
}
badguy_data.clear();
}
@@
-630,23
+648,18
@@
Level::load_gfx()
snprintf(fname, 1024, "%s/background/%s", st_dir, bkgd_image.c_str());
if(!faccessible(fname))
snprintf(fname, 1024, "%s/images/background/%s", datadir.c_str(), bkgd_image.c_str());
snprintf(fname, 1024, "%s/background/%s", st_dir, bkgd_image.c_str());
if(!faccessible(fname))
snprintf(fname, 1024, "%s/images/background/%s", datadir.c_str(), bkgd_image.c_str());
+ delete img_bkgd;
img_bkgd = new Surface(fname, IGNORE_ALPHA);
}
else
{
img_bkgd = new Surface(fname, IGNORE_ALPHA);
}
else
{
+ delete img_bkgd;
img_bkgd = 0;
}
}
img_bkgd = 0;
}
}
-void
-Level::free_gfx()
-{
- delete img_bkgd;
-}
-
/* Load a level-specific graphic... */
/* Load a level-specific graphic... */
-void
-Level::load_image(Surface** ptexture, string theme,const char * file, int use_alpha)
+void Level::load_image(Surface** ptexture, string theme,const char * file, int use_alpha)
{
char fname[1024];
{
char fname[1024];