X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=9ae1831ee2fd13e0e4b7ada03f9ac9ae8493934a;hb=ee6db785e8eff4883da70b404a9bdb4a42e75ac3;hp=bdc3f53b2467eec6da73fc2cea8c207b713f01a3;hpb=655fb8b4bdd23552ef087fe5a9625ffd9934b0a9;p=supertux.git diff --git a/src/level.cpp b/src/level.cpp index bdc3f53b2..9ae1831ee 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -1,14 +1,22 @@ +// $Id$ +// +// SuperTux +// Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details // -// C Implementation: level -// -// Description: -// -// -// Author: Tobias Glaesser , (C) 2003 -// -// Copyright: See COPYING file that comes with this distribution -// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. // +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. #include #include @@ -122,12 +130,12 @@ void st_subset::load(char *subset) snprintf(str, 1024, "%s.png", filename); if(faccessible(str)) { - texture_load(&image,str,IGNORE_ALPHA); + image = new Surface(str,IGNORE_ALPHA); } else { snprintf(filename, 1024, "%s/images/status/level-subset-info.png", datadir.c_str()); - texture_load(&image,filename,IGNORE_ALPHA); + image = new Surface(filename,IGNORE_ALPHA); } } @@ -186,10 +194,24 @@ void st_subset::free() title.clear(); description.clear(); name.clear(); - texture_free(&image); + delete image; levels = 0; } +Level::Level() +{ +} + +Level::Level(const std::string& subset, int level) +{ + load(subset, level); +} + +Level::Level(const std::string& filename) +{ + load(filename); +} + void Level::init_defaults() { @@ -199,35 +221,35 @@ Level::init_defaults() song_title = "Mortimers_chipdisko.mod"; bkgd_image = "arctis.png"; width = 21; + start_pos_x = 100; + start_pos_y = 170; time_left = 100; gravity = 10.; - bkgd_top_red = 0; - bkgd_top_green = 0; - bkgd_top_blue = 0; - bkgd_bottom_red = 0; - bkgd_bottom_green = 0; - bkgd_bottom_blue = 0; + bkgd_top.red = 0; + bkgd_top.green = 0; + bkgd_top.blue = 0; + bkgd_bottom.red = 255; + bkgd_bottom.green = 255; + bkgd_bottom.blue = 255; endpos = 0; for(int i = 0; i < 15; ++i) { - ia_tiles[i] = (unsigned int*) malloc((width+1)*sizeof(unsigned int)); + 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; - ia_tiles[i][width] = (unsigned int) '\0'; - bg_tiles[i] = (unsigned int*) malloc((width+1)*sizeof(unsigned int)); + 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; - bg_tiles[i][width] = (unsigned int) '\0'; - fg_tiles[i] = (unsigned int*) malloc((width+1)*sizeof(unsigned int)); + 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; - fg_tiles[i][width] = (unsigned int) '\0'; } } @@ -273,16 +295,20 @@ Level::load(const std::string& filename) if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) { LispReader reader(lisp_cdr(root_obj)); - reader.read_int("version", &version); reader.read_int("width", &width); + if (!reader.read_int("start_pos_x", &start_pos_x)) start_pos_x = 100; + if (!reader.read_int("start_pos_y", &start_pos_y)) start_pos_y = 170; reader.read_int("time", &time_left); - reader.read_int("bkgd_top_red", &bkgd_top_red); - reader.read_int("bkgd_top_green", &bkgd_top_green); - reader.read_int("bkgd_top_blue", &bkgd_top_blue); - reader.read_int("bkgd_bottom_red", &bkgd_bottom_red); - reader.read_int("bkgd_bottom_green", &bkgd_bottom_green); - reader.read_int("bkgd_bottom_blue", &bkgd_bottom_blue); + + reader.read_int("bkgd_top_red", &bkgd_top.red); + reader.read_int("bkgd_top_green", &bkgd_top.green); + reader.read_int("bkgd_top_blue", &bkgd_top.blue); + + reader.read_int("bkgd_bottom_red", &bkgd_bottom.red); + reader.read_int("bkgd_bottom_green", &bkgd_bottom.green); + reader.read_int("bkgd_bottom_blue", &bkgd_bottom.blue); + reader.read_float("gravity", &gravity); reader.read_string("name", &name); reader.read_string("author", &author); @@ -297,7 +323,29 @@ Level::load(const std::string& filename) reader.read_int_vector("foreground-tm", &fg_tm); - { + { // Read ResetPoints + lisp_object_t* cur = 0; + if (reader.read_lisp("reset-points", &cur)) + { + while (!lisp_nil_p(cur)) + { + lisp_object_t* data = lisp_car(cur); + + ResetPoint pos; + + LispReader reader(lisp_cdr(data)); + if (reader.read_int("x", &pos.x) + && reader.read_int("y", &pos.y)) + { + reset_points.push_back(pos); + } + + cur = lisp_cdr(cur); + } + } + } + + { // Read BadGuys lisp_object_t* cur = 0; if (reader.read_lisp("objects", &cur)) { @@ -310,6 +358,7 @@ Level::load(const std::string& filename) 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); @@ -368,7 +417,7 @@ Level::load(const std::string& filename) if (*i == '0' || *i == '1' || *i == '2') { badguy_data.push_back(BadGuyData(static_cast(*i-'0'), - x*32, y*32)); + x*32, y*32, false)); *i = 0; } else @@ -391,9 +440,9 @@ Level::load(const std::string& filename) for(int i = 0; i < 15; ++i) { - ia_tiles[i] = (unsigned int*) calloc((width +1) , sizeof(unsigned int) ); - bg_tiles[i] = (unsigned int*) calloc((width +1) , sizeof(unsigned int) ); - fg_tiles[i] = (unsigned int*) calloc((width +1) , sizeof(unsigned int) ); + ia_tiles[i].resize(width + 1, 0); + bg_tiles[i].resize(width + 1, 0); + fg_tiles[i].resize(width + 1, 0); } int i = 0; @@ -476,12 +525,12 @@ Level::save(const char * subset, int level) 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_top_red %d)\n", bkgd_top_red); - fprintf(fi," (bkgd_top_green %d)\n", bkgd_top_green); - fprintf(fi," (bkgd_top_blue %d)\n", bkgd_top_blue); - fprintf(fi," (bkgd_bottom_red %d)\n", bkgd_bottom_red); - fprintf(fi," (bkgd_bottom_green %d)\n", bkgd_bottom_green); - fprintf(fi," (bkgd_bottom_blue %d)\n", bkgd_bottom_blue); + fprintf(fi," (bkgd_top_red %d)\n", bkgd_top.red); + fprintf(fi," (bkgd_top_green %d)\n", bkgd_top.green); + fprintf(fi," (bkgd_top_blue %d)\n", bkgd_top.blue); + fprintf(fi," (bkgd_bottom_red %d)\n", bkgd_bottom.red); + fprintf(fi," (bkgd_bottom_green %d)\n", bkgd_bottom.green); + fprintf(fi," (bkgd_bottom_blue %d)\n", bkgd_bottom.blue); fprintf(fi," (time %d)\n", time_left); fprintf(fi," (width %d)\n", width); fprintf(fi," (gravity %2.1f)\n", gravity); @@ -512,12 +561,21 @@ Level::save(const char * subset, int level) } fprintf( fi,")\n"); + + fprintf( fi,"(reset-points\n"); + 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))\n",badguykind_to_string((*it).kind).c_str(),(*it).x,(*it).y); + 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"); @@ -533,12 +591,13 @@ void Level::cleanup() { for(int i=0; i < 15; ++i) - free(bg_tiles[i]); - for(int i=0; i < 15; ++i) - free(ia_tiles[i]); - for(int i=0; i < 15; ++i) - free(fg_tiles[i]); + { + bg_tiles[i].clear(); + ia_tiles[i].clear(); + fg_tiles[i].clear(); + } + reset_points.clear(); name.clear(); author.clear(); theme.clear(); @@ -557,7 +616,7 @@ 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()); - texture_load(&img_bkgd, fname, IGNORE_ALPHA); + img_bkgd = new Surface(fname, IGNORE_ALPHA); } else { @@ -569,12 +628,12 @@ Level::load_gfx() void Level::free_gfx() { - texture_free(&img_bkgd); + delete img_bkgd; } /* Load a level-specific graphic... */ void -Level::load_image(texture_type* ptexture, string theme,const char * file, int use_alpha) +Level::load_image(Surface** ptexture, string theme,const char * file, int use_alpha) { char fname[1024]; @@ -582,20 +641,7 @@ Level::load_image(texture_type* ptexture, string theme,const char * file, int u if(!faccessible(fname)) snprintf(fname, 1024, "%s/images/themes/%s/%s", datadir.c_str(), theme.c_str(), file); - texture_load(ptexture, fname, use_alpha); -} - -void tilemap_change_size(unsigned int** tilemap[15], int w, int old_w) -{ - int j,y; - for(y = 0; y < 15; ++y) - { - *tilemap[y] = (unsigned int*) realloc(*tilemap[y],(w+1)*sizeof(unsigned int)); - if(w > old_w) - for(j = 0; j < w - old_w; ++j) - *tilemap[y][old_w+j] = 0; - *tilemap[y][w] = 0; - } + *ptexture = new Surface(fname, use_alpha); } /* Change the size of a level (width) */ @@ -605,9 +651,12 @@ Level::change_size (int new_width) if(new_width < 21) new_width = 21; - tilemap_change_size((unsigned int***)&ia_tiles, new_width, width); - tilemap_change_size((unsigned int***)&bg_tiles, new_width, width); - tilemap_change_size((unsigned int***)&fg_tiles, new_width, width); + 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); + } width = new_width; } @@ -661,7 +710,6 @@ Level::load_song() free(song_path); } - unsigned int Level::gettileid(float x, float y) {