X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=4bdf8854f9320636c8eb45f8ed6a0059bdbc047a;hb=403f2652505e814b645892bffaf89a584984f9b8;hp=ff8073748a76a3744fdc191a1f54df4a662424c5;hpb=1d859c5e6b6af961837b7a7ae20a17b67d46e04f;p=supertux.git diff --git a/src/level.cpp b/src/level.cpp index ff8073748..4bdf8854f 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "globals.h" #include "setup.h" #include "screen.h" @@ -33,6 +34,9 @@ #include "lispreader.h" #include "resources.h" #include "music_manager.h" +#include "gameobjs.h" +#include "world.h" +#include "lispwriter.h" using namespace std; @@ -55,7 +59,7 @@ void LevelSubset::create(const std::string& subset_name) new_subset.description = "No description so far."; new_subset.save(); new_lev.init_defaults(); - new_lev.save(subset_name, 1); + new_lev.save(subset_name, 1, 0); } void LevelSubset::parse (lisp_object_t* cursor) @@ -205,20 +209,6 @@ Level::Level() init_defaults(); } -Level::Level(const std::string& subset, int level) - : img_bkgd(0) -{ - if(load(subset, level) < 0) - st_abort("Couldn't load level from subset", subset.c_str()); -} - -Level::Level(const std::string& filename) - : img_bkgd(0) -{ - if(load(filename) < 0) - st_abort("Couldn't load level " , filename.c_str()); -} - Level::~Level() { delete img_bkgd; @@ -229,15 +219,17 @@ Level::init_defaults() { name = "UnNamed"; author = "UnNamed"; - theme = "antarctica"; song_title = "Mortimers_chipdisko.mod"; bkgd_image = "arctis.png"; - width = 21; + width = 0; + height = 0; start_pos_x = 100; start_pos_y = 170; time_left = 100; gravity = 10.; back_scrolling = false; + hor_autoscroll_speed = 0; + bkgd_speed = 50; bkgd_top.red = 0; bkgd_top.green = 0; bkgd_top.blue = 0; @@ -245,28 +237,11 @@ Level::init_defaults() bkgd_bottom.green = 255; bkgd_bottom.blue = 255; - for(int i = 0; i < 15; ++i) - { - ia_tiles[i].resize(width+1, 0); - ia_tiles[i][width] = (unsigned int) '\0'; - - for(int y = 0; y < width; ++y) - ia_tiles[i][y] = 0; - - bg_tiles[i].resize(width+1, 0); - bg_tiles[i][width] = (unsigned int) '\0'; - for(int y = 0; y < width; ++y) - bg_tiles[i][y] = 0; - - fg_tiles[i].resize(width+1, 0); - fg_tiles[i][width] = (unsigned int) '\0'; - for(int y = 0; y < width; ++y) - fg_tiles[i][y] = 0; - } + resize(21, 19); } int -Level::load(const std::string& subset, int level) +Level::load(const std::string& subset, int level, World* world) { char filename[1024]; @@ -275,11 +250,11 @@ Level::load(const std::string& subset, int level) if(!faccessible(filename)) snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset.c_str(), level); - return load(filename); + return load(filename, world); } int -Level::load(const std::string& filename) +Level::load(const std::string& filename, World* world) { lisp_object_t* root_obj = lisp_read_from_file(filename); if (!root_obj) @@ -294,10 +269,6 @@ Level::load(const std::string& filename) return -1; } - vector ia_tm; - vector bg_tm; - vector fg_tm; - int version = 0; if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) { @@ -313,9 +284,19 @@ Level::load(const std::string& filename) printf("Warning no time specified for level.\n"); } + height = 15; + reader.read_int("height", &height); + 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 = 50; + 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); @@ -332,8 +313,6 @@ Level::load(const std::string& filename) 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 = ""; @@ -341,12 +320,18 @@ Level::load(const std::string& filename) particle_system = ""; reader.read_string("particle_system", &particle_system); - reader.read_int_vector("background-tm", &bg_tm); + reader.read_int_vector("background-tm", &bg_tiles); + if(int(bg_tiles.size()) != width * height) + st_abort("Wrong size of backgroundtilemap", ""); - if (!reader.read_int_vector("interactive-tm", &ia_tm)) - reader.read_int_vector("tilemap", &ia_tm); + if (!reader.read_int_vector("interactive-tm", &ia_tiles)) + reader.read_int_vector("tilemap", &ia_tiles); + if(int(ia_tiles.size()) != width * height) + st_abort("Wrong size of interactivetilemap", ""); - reader.read_int_vector("foreground-tm", &fg_tm); + reader.read_int_vector("foreground-tm", &fg_tiles); + if(int(fg_tiles.size()) != width * height) + st_abort("Wrong size of foregroundtilemap", ""); { // Read ResetPoints lisp_object_t* cur = 0; @@ -374,24 +359,12 @@ Level::load(const std::string& filename) lisp_object_t* cur = 0; if (reader.read_lisp("objects", &cur)) { - while (!lisp_nil_p(cur)) - { - lisp_object_t* data = lisp_car(cur); - - BadGuyData bg_data; - bg_data.kind = badguykind_from_string(lisp_symbol(lisp_car(data))); - LispReader reader(lisp_cdr(data)); - reader.read_int("x", &bg_data.x); - reader.read_int("y", &bg_data.y); - reader.read_bool("stay-on-platform", &bg_data.stay_on_platform); - - badguy_data.push_back(bg_data); - - cur = lisp_cdr(cur); - } + if(world) + world->parse_objects(cur); } } +#if 0 // TODO fix this or remove it // Convert old levels to the new tile numbers if (version == 0) { @@ -461,49 +434,7 @@ Level::load(const std::string& filename) } } } - } - - for(int i = 0; i < 15; ++i) - { - ia_tiles[i].resize(width + 1, 0); - bg_tiles[i].resize(width + 1, 0); - fg_tiles[i].resize(width + 1, 0); - } - - int i = 0; - int j = 0; - for(vector::iterator it = ia_tm.begin(); it != ia_tm.end(); ++it, ++i) - { - ia_tiles[j][i] = (*it); - if(i == width - 1) - { - i = -1; - ++j; - } - } - - i = j = 0; - for(vector::iterator it = bg_tm.begin(); it != bg_tm.end(); ++it, ++i) - { - - bg_tiles[j][i] = (*it); - if(i == width - 1) - { - i = -1; - ++j; - } - } - - i = j = 0; - for(vector::iterator it = fg_tm.begin(); it != fg_tm.end(); ++it, ++i) - { - - fg_tiles[j][i] = (*it); - if(i == width - 1) - { - i = -1; - ++j; - } +#endif } lisp_free(root_obj); @@ -513,7 +444,7 @@ Level::load(const std::string& filename) /* Save data for level: */ void -Level::save(const std::string& subset, int level) +Level::save(const std::string& subset, int level, World* world) { char filename[1024]; char str[80]; @@ -527,110 +458,77 @@ Level::save(const std::string& subset, int 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) - { - perror(filename); - st_shutdown(); - exit(-1); - } - + std::ofstream out(filename); + if(!out.good()) { + st_abort("Couldn't write file.", filename); + } + LispWriter writer(out); /* Write header: */ - fprintf(fi,";SuperTux-Level\n"); - fprintf(fi,"(supertux-level\n"); - - 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," (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_bottom %d)\n", bkgd_bottom.red); - fprintf(fi," (bkgd_green_bottom %d)\n", bkgd_bottom.green); - 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," (gravity %2.1f)\n", gravity); - fprintf(fi," (background-tm "); - - for(int y = 0; y < 15; ++y) - { - for(int i = 0; i < width; ++i) - fprintf(fi," %d ", bg_tiles[y][i]); - } - - fprintf( fi,")\n"); - fprintf(fi," (interactive-tm "); - - for(int y = 0; y < 15; ++y) - { - for(int i = 0; i < width; ++i) - fprintf(fi," %d ", ia_tiles[y][i]); - } - - fprintf( fi,")\n"); - fprintf(fi," (foreground-tm "); - - for(int y = 0; y < 15; ++y) - { - for(int i = 0; i < width; ++i) - fprintf(fi," %d ", fg_tiles[y][i]); - } - - fprintf( fi,")\n"); - - fprintf( fi,"(reset-points\n"); + writer.write_comment("SuperTux level made using the built-in leveleditor"); + writer.start_list("supertux-level"); + + writer.write_int("version", 1); + writer.write_string("name", name); + writer.write_string("author", author); + writer.write_string("music", song_title); + writer.write_string("background", bkgd_image); + writer.write_string("particle_system", particle_system); + writer.write_int("bkgd_speed", bkgd_speed); + writer.write_int("bkgd_red_top", bkgd_top.red); + writer.write_int("bkgd_green_top", bkgd_top.green); + writer.write_int("bkgd_blue_top", bkgd_top.blue); + writer.write_int("bkgd_red_bottom", bkgd_bottom.red); + writer.write_int("bkgd_green_bottom", bkgd_bottom.green); + writer.write_int("bkgd_blue_bottom", bkgd_bottom.blue); + writer.write_int("time", time_left); + writer.write_int("width", width); + writer.write_int("height", height); + writer.write_bool("back_scrolling", back_scrolling); + writer.write_float("hor_autoscroll_speed", hor_autoscroll_speed); + writer.write_float("gravity", gravity); + + writer.write_int_vector("background-tm", bg_tiles); + writer.write_int_vector("interactive-tm", ia_tiles); + writer.write_int_vector("foreground-tm", fg_tiles); + + writer.start_list("reset-points"); for(std::vector::iterator i = reset_points.begin(); - i != reset_points.end(); ++i) - fprintf( fi,"(point (x %d) (y %d))\n",i->x, i->y); - fprintf( fi,")\n"); - - fprintf( fi,"(objects\n"); - - for(std::vector::iterator it = badguy_data.begin(); - it != badguy_data.end(); - ++it) - fprintf( fi,"(%s (x %d) (y %d) (stay-on-platform %s))\n", - badguykind_to_string((*it).kind).c_str(),(*it).x,(*it).y, - it->stay_on_platform ? "#t" : "#f"); - - fprintf( fi,")\n"); - - fprintf( fi,")\n"); + i != reset_points.end(); ++i) { + writer.start_list("point"); + writer.write_int("x", i->x); + writer.write_int("y", i->y); + } + writer.end_list("reset-points"); + + // write objects + writer.start_list("objects"); + // pick all objects that can be written into a levelfile + for(std::vector::iterator it = world->gameobjects.begin(); + it != world->gameobjects.end(); ++it) { + Serializable* serializable = dynamic_cast (*it); + if(serializable) + serializable->write(writer); + } + writer.end_list("objects"); - fclose(fi); + writer.end_list("supertux-level"); + out.close(); } - /* Unload data for this level: */ - void Level::cleanup() { - for(int i=0; i < 15; ++i) - { - bg_tiles[i].clear(); - ia_tiles[i].clear(); - fg_tiles[i].clear(); - } + bg_tiles.clear(); + ia_tiles.clear(); + fg_tiles.clear(); reset_points.clear(); - name.clear(); - author.clear(); - theme.clear(); - song_title.clear(); - bkgd_image.clear(); - - badguy_data.clear(); + name = ""; + author = ""; + song_title = ""; + bkgd_image = ""; } void @@ -653,8 +551,7 @@ Level::load_gfx() } /* 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]; @@ -665,20 +562,31 @@ Level::load_image(Surface** ptexture, string theme,const char * file, int use_a *ptexture = new Surface(fname, use_alpha); } -/* Change the size of a level (width) */ +/* Change the size of a level */ void -Level::change_size (int new_width) +Level::resize(int new_width, int new_height) { - if(new_width < 21) - new_width = 21; - - for(int y = 0; y < 15; ++y) - { - ia_tiles[y].resize(new_width, 0); - bg_tiles[y].resize(new_width, 0); - fg_tiles[y].resize(new_width, 0); + // first: resize height + ia_tiles.resize(new_height * width, 0); + bg_tiles.resize(new_height * width, 0); + fg_tiles.resize(new_height * width, 0); + height = new_height; + + // remap horizontal tiles for new width + int np = 0; + for(int y = 0; y < height; ++y) { + for(int x = 0; x < new_width && x < width; ++x) { + ia_tiles[np] = ia_tiles[y * width + x]; + bg_tiles[np] = bg_tiles[y * width + x]; + fg_tiles[np] = fg_tiles[y * width + x]; + np++; } + } + ia_tiles.resize(new_height * new_width); + bg_tiles.resize(new_height * new_width); + fg_tiles.resize(new_height * new_width); + width = new_width; } @@ -688,23 +596,42 @@ Level::change(float x, float y, int tm, unsigned int c) int yy = ((int)y / 32); int xx = ((int)x / 32); - if (yy >= 0 && yy < 15 && xx >= 0 && xx <= width) + if (yy >= 0 && yy < height && xx >= 0 && xx <= width) { switch(tm) { case TM_BG: - bg_tiles[yy][xx] = c; + bg_tiles[yy * width + xx] = c; break; case TM_IA: - ia_tiles[yy][xx] = c; + ia_tiles[yy * width + xx] = c; break; case TM_FG: - fg_tiles[yy][xx] = c; + fg_tiles[yy * width + xx] = c; break; } } } +void Level::draw_bg() +{ + if(img_bkgd) + { + // Tile background horizontally + int sx = (int)((float)scroll_x * ((float)bkgd_speed/100.0f)) % img_bkgd->w; + int sy = (int)((float)scroll_y * ((float)bkgd_speed/100.0f)) % img_bkgd->h; + for (int x = 0; (x-1)*img_bkgd->w <= screen->w; x++) + for (int y = 0; (y-1)*img_bkgd->h <= screen->h; y++) + img_bkgd->draw_part(x == 0 ? sx : 0, y == 0 ? sy : 0, + x == 0 ? 0 : (img_bkgd->w * x) - sx, y == 0 ? 0 : (img_bkgd->h * y) - sy, + x == 0 ? img_bkgd->w - sx : img_bkgd->w, y == 0 ? img_bkgd->h - sy : img_bkgd->h); + } + else + { + drawgradient(bkgd_top, bkgd_bottom); + } +} + void Level::load_song() { @@ -749,8 +676,8 @@ Level::gettileid(float x, float y) const yy = ((int)y / 32); xx = ((int)x / 32); - if (yy >= 0 && yy < 15 && xx >= 0 && xx <= width) - c = ia_tiles[yy][xx]; + if (yy >= 0 && yy < height && xx >= 0 && xx <= width) + c = ia_tiles[yy * width + xx]; else c = 0; @@ -760,10 +687,10 @@ Level::gettileid(float x, float y) const unsigned int Level::get_tile_at(int x, int y) const { - if(x < 0 || x > width || y < 0 || y > 14) + if(x < 0 || x >= width || y < 0 || y >= height) return 0; - return ia_tiles[y][x]; + return ia_tiles[y * width + x]; } /* EOF */