X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=9ae1831ee2fd13e0e4b7ada03f9ac9ae8493934a;hb=ee6db785e8eff4883da70b404a9bdb4a42e75ac3;hp=9fb802c45f77b8f1702aa57ead5341f433a0ebd8;hpb=ac2b263bb256df9d50212819a94de2a63f161272;p=supertux.git diff --git a/src/level.cpp b/src/level.cpp index 9fb802c45..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 @@ -21,12 +29,11 @@ #include "level.h" #include "physic.h" #include "scene.h" +#include "tile.h" #include "lispreader.h" using namespace std; -texture_type img_bkgd, img_bkgd_tile[2][4], img_solid[4], img_brick[2]; - st_subset::st_subset() { levels = 0; @@ -34,14 +41,14 @@ st_subset::st_subset() void st_subset::create(const std::string& subset_name) { - st_level new_lev; + Level new_lev; st_subset new_subset; new_subset.name = subset_name; new_subset.title = "Unknown Title"; new_subset.description = "No description so far."; new_subset.save(); - level_default(&new_lev); - level_save(&new_lev,subset_name.c_str(),1); + new_lev.init_defaults(); + new_lev.save(subset_name.c_str(),1); } void st_subset::parse (lisp_object_t* cursor) @@ -123,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); } } @@ -187,75 +194,87 @@ void st_subset::free() title.clear(); description.clear(); name.clear(); - texture_free(&image); + delete image; levels = 0; } -void level_default(st_level* plevel) +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() { - int i,y; - plevel->name = "UnNamed"; - plevel->theme = "antarctica"; - plevel->song_title = "Mortimers_chipdisko.mod"; - plevel->bkgd_image = "arctis.png"; - plevel->width = 21; - plevel->time_left = 100; - plevel->gravity = 10.; - plevel->bkgd_red = 0; - plevel->bkgd_green = 0; - plevel->bkgd_blue = 0; - - for(i = 0; i < 15; ++i) + name = "UnNamed"; + author = "UnNamed"; + theme = "antarctica"; + 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 = 255; + bkgd_bottom.green = 255; + bkgd_bottom.blue = 255; + endpos = 0; + + for(int i = 0; i < 15; ++i) { - plevel->ia_tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int)); - plevel->ia_tiles[i][plevel->width] = (unsigned int) '\0'; - for(y = 0; y < plevel->width; ++y) - plevel->ia_tiles[i][y] = (unsigned int) '.'; - plevel->ia_tiles[i][plevel->width] = (unsigned int) '\0'; - - plevel->bg_tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int)); - plevel->bg_tiles[i][plevel->width] = (unsigned int) '\0'; - for(y = 0; y < plevel->width; ++y) - plevel->bg_tiles[i][y] = (unsigned int) '.'; - plevel->bg_tiles[i][plevel->width] = (unsigned int) '\0'; - - plevel->fg_tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int)); - plevel->fg_tiles[i][plevel->width] = (unsigned int) '\0'; - for(y = 0; y < plevel->width; ++y) - plevel->fg_tiles[i][y] = (unsigned int) '.'; - plevel->fg_tiles[i][plevel->width] = (unsigned int) '\0'; - - plevel->dn_tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int)); - plevel->dn_tiles[i][plevel->width] = (unsigned int) '\0'; - for(y = 0; y < plevel->width; ++y) - plevel->dn_tiles[i][y] = (unsigned int) '.'; - plevel->dn_tiles[i][plevel->width] = (unsigned int) '\0'; + 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; } } -/* Load data for this level: */ -/* Returns -1, if the loading of the level failed. */ -int level_load(st_level* plevel, const char *subset, int level) +int +Level::load(const std::string& subset, int level) { char filename[1024]; - /* Load data file: */ - - snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset, level); + // Load data file: + snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset.c_str(), level); if(!faccessible(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); - return level_load(plevel, filename); + return load(filename); } -int level_load(st_level* plevel, const char* filename) +int +Level::load(const std::string& filename) { FILE * fi; lisp_object_t* root_obj = 0; - fi = fopen(filename, "r"); + fi = fopen(filename.c_str(), "r"); if (fi == NULL) { - perror(filename); + perror(filename.c_str()); return -1; } @@ -265,7 +284,7 @@ int level_load(st_level* plevel, const char* filename) if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR) { - printf("World: Parse Error in file %s", filename); + printf("World: Parse Error in file %s", filename.c_str()); } vector ia_tm; @@ -276,19 +295,27 @@ int level_load(st_level* plevel, const char* 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", &plevel->width); - reader.read_int("time", &plevel->time_left); - reader.read_int("bkgd_red", &plevel->bkgd_red); - reader.read_int("bkgd_green", &plevel->bkgd_green); - reader.read_int("bkgd_blue", &plevel->bkgd_blue); - reader.read_float("gravity", &plevel->gravity); - reader.read_string("name", &plevel->name); - reader.read_string("theme", &plevel->theme); - reader.read_string("music", &plevel->song_title); - reader.read_string("background", &plevel->bkgd_image); - reader.read_string("particle_system", &plevel->particle_system); + 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_float("gravity", &gravity); + reader.read_string("name", &name); + reader.read_string("author", &author); + reader.read_string("theme", &theme); + reader.read_string("music", &song_title); + reader.read_string("background", &bkgd_image); + reader.read_string("particle_system", &particle_system); reader.read_int_vector("background-tm", &bg_tm); if (!reader.read_int_vector("interactive-tm", &ia_tm)) @@ -296,7 +323,29 @@ int level_load(st_level* plevel, const char* 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)) { @@ -309,12 +358,13 @@ int level_load(st_level* plevel, const char* 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); - plevel->badguy_data.push_back(bg_data); - cur = lisp_cdr(cur); } - } + } } // Convert old levels to the new tile numbers @@ -348,9 +398,9 @@ int level_load(st_level* plevel, const char* filename) transtable['h'] = 98; transtable['i'] = 99; transtable['j'] = 100 - ; + ; transtable['#'] = 11; - transtable['['] = 13; + transtable['['] = 13; transtable['='] = 14; transtable[']'] = 15; transtable['$'] = 82; @@ -366,8 +416,8 @@ int level_load(st_level* plevel, const char* filename) { if (*i == '0' || *i == '1' || *i == '2') { - plevel->badguy_data.push_back(BadGuyData(static_cast(*i-'0'), - x*32, y*32)); + badguy_data.push_back(BadGuyData(static_cast(*i-'0'), + x*32, y*32, false)); *i = 0; } else @@ -379,28 +429,28 @@ int level_load(st_level* plevel, const char* filename) printf("Error: conversion will fail, unsupported char: '%c' (%d)\n", *i, *i); } ++x; - if (x >= plevel->width) { - x = 0; - ++y; - } + if (x >= width) + { + x = 0; + ++y; + } } } } for(int i = 0; i < 15; ++i) { - plevel->dn_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) ); - plevel->ia_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) ); - plevel->bg_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) ); - plevel->fg_tiles[i] = (unsigned int*) calloc((plevel->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; int j = 0; for(vector::iterator it = ia_tm.begin(); it != ia_tm.end(); ++it, ++i) { - plevel->ia_tiles[j][i] = (*it); - if(i == plevel->width - 1) + ia_tiles[j][i] = (*it); + if(i == width - 1) { i = -1; ++j; @@ -411,8 +461,8 @@ int level_load(st_level* plevel, const char* filename) for(vector::iterator it = bg_tm.begin(); it != bg_tm.end(); ++it, ++i) { - plevel->bg_tiles[j][i] = (*it); - if(i == plevel->width - 1) + bg_tiles[j][i] = (*it); + if(i == width - 1) { i = -1; ++j; @@ -423,30 +473,18 @@ int level_load(st_level* plevel, const char* filename) for(vector::iterator it = fg_tm.begin(); it != fg_tm.end(); ++it, ++i) { - plevel->fg_tiles[j][i] = (*it); - if(i == plevel->width - 1) + fg_tiles[j][i] = (*it); + if(i == width - 1) { i = -1; ++j; } } - /* Set the global gravity to the latest loaded level's gravity */ - gravity = plevel->gravity; - - /* Mark the end position of this level! - Is a bit wrong here thought * / - - for (y = 0; y < 15; ++y) - { - for (x = 0; x < plevel->width; ++x) - { - if(plevel->tiles[y][x] == '|') - { - if(x*32 > endpos) - endpos = x*32; - } - } - }*/ + // Mark the end position of this level! + // FIXME: -10 is a rather random value, we still need some kind of + // real levelend gola + endpos = 32*(width-10); fclose(fi); return 0; @@ -454,11 +492,10 @@ int level_load(st_level* plevel, const char* filename) /* Save data for level: */ -void level_save(st_level* plevel,const char * subset, int level) +void +Level::save(const char * subset, int level) { - FILE * fi; char filename[1024]; - int y,i; char str[80]; /* Save data file: */ @@ -468,7 +505,7 @@ void level_save(st_level* plevel,const char * subset, int level) if(!fwriteable(filename)) snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset, level); - fi = fopen(filename, "w"); + FILE * fi = fopen(filename, "w"); if (fi == NULL) { perror(filename); @@ -482,53 +519,66 @@ void level_save(st_level* plevel,const char * subset, int level) fprintf(fi,"(supertux-level\n"); fprintf(fi," (version %d)\n", 1); - fprintf(fi," (name \"%s\")\n", plevel->name.c_str()); - fprintf(fi," (theme \"%s\")\n", plevel->theme.c_str()); - fprintf(fi," (music \"%s\")\n", plevel->song_title.c_str()); - fprintf(fi," (background \"%s\")\n", plevel->bkgd_image.c_str()); - fprintf(fi," (particle_system \"%s\")\n", plevel->particle_system.c_str()); - fprintf(fi," (bkgd_red %d)\n", plevel->bkgd_red); - fprintf(fi," (bkgd_green %d)\n", plevel->bkgd_green); - fprintf(fi," (bkgd_blue %d)\n", plevel->bkgd_blue); - fprintf(fi," (time %d)\n", plevel->time_left); - fprintf(fi," (width %d)\n", plevel->width); - fprintf(fi," (gravity %2.1f)\n", plevel->gravity); + 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_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); fprintf(fi," (background-tm "); - for(y = 0; y < 15; ++y) + for(int y = 0; y < 15; ++y) { - for(i = 0; i < plevel->width; ++i) - fprintf(fi," %d ", plevel->bg_tiles[y][i]); + for(int i = 0; i < width; ++i) + fprintf(fi," %d ", bg_tiles[y][i]); } fprintf( fi,")\n"); fprintf(fi," (interactive-tm "); - for(y = 0; y < 15; ++y) + for(int y = 0; y < 15; ++y) { - for(i = 0; i < plevel->width; ++i) - fprintf(fi," %d ", plevel->ia_tiles[y][i]); + for(int i = 0; i < width; ++i) + fprintf(fi," %d ", ia_tiles[y][i]); } fprintf( fi,")\n"); - fprintf(fi," (dynamic-tm "); + fprintf(fi," (foreground-tm "); - for(y = 0; y < 15; ++y) + for(int y = 0; y < 15; ++y) { - for(i = 0; i < plevel->width; ++i) - fprintf(fi," %d ", plevel->dn_tiles[y][i]); + for(int i = 0; i < width; ++i) + fprintf(fi," %d ", fg_tiles[y][i]); } fprintf( fi,")\n"); - fprintf(fi," (foreground-tm "); - for(y = 0; y < 15; ++y) - { - for(i = 0; i < plevel->width; ++i) - fprintf(fi," %d ", plevel->fg_tiles[y][i]); - } + 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) (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,")"); fprintf( fi,")\n"); fclose(fi); @@ -537,84 +587,53 @@ void level_save(st_level* plevel,const char * subset, int level) /* Unload data for this level: */ -void level_free(st_level* plevel) +void +Level::cleanup() { - int i; - for(i=0; i < 15; ++i) - free(plevel->bg_tiles[i]); - for(i=0; i < 15; ++i) - free(plevel->ia_tiles[i]); - for(i=0; i < 15; ++i) - free(plevel->dn_tiles[i]); - for(i=0; i < 15; ++i) - free(plevel->fg_tiles[i]); - - plevel->name.clear(); - plevel->theme.clear(); - plevel->song_title.clear(); - plevel->bkgd_image.clear(); -} - -/* Load graphics: */ - -void level_load_gfx(st_level *plevel) -{ - level_load_image(&img_brick[0],plevel->theme,"brick0.png", IGNORE_ALPHA); - level_load_image(&img_brick[1],plevel->theme,"brick1.png", IGNORE_ALPHA); - - level_load_image(&img_solid[0],plevel->theme,"solid0.png", USE_ALPHA); - level_load_image(&img_solid[1],plevel->theme,"solid1.png", USE_ALPHA); - level_load_image(&img_solid[2],plevel->theme,"solid2.png", USE_ALPHA); - level_load_image(&img_solid[3],plevel->theme,"solid3.png", USE_ALPHA); + for(int i=0; i < 15; ++i) + { + bg_tiles[i].clear(); + ia_tiles[i].clear(); + fg_tiles[i].clear(); + } - level_load_image(&img_bkgd_tile[0][0],plevel->theme,"bkgd-00.png", USE_ALPHA); - level_load_image(&img_bkgd_tile[0][1],plevel->theme,"bkgd-01.png", USE_ALPHA); - level_load_image(&img_bkgd_tile[0][2],plevel->theme,"bkgd-02.png", USE_ALPHA); - level_load_image(&img_bkgd_tile[0][3],plevel->theme,"bkgd-03.png", USE_ALPHA); + reset_points.clear(); + name.clear(); + author.clear(); + theme.clear(); + song_title.clear(); + bkgd_image.clear(); - level_load_image(&img_bkgd_tile[1][0],plevel->theme,"bkgd-10.png", USE_ALPHA); - level_load_image(&img_bkgd_tile[1][1],plevel->theme,"bkgd-11.png", USE_ALPHA); - level_load_image(&img_bkgd_tile[1][2],plevel->theme,"bkgd-12.png", USE_ALPHA); - level_load_image(&img_bkgd_tile[1][3],plevel->theme,"bkgd-13.png", USE_ALPHA); + badguy_data.clear(); +} - if(!plevel->bkgd_image.empty()) +void +Level::load_gfx() +{ + if(!bkgd_image.empty()) { char fname[1024]; - snprintf(fname, 1024, "%s/background/%s", st_dir, plevel->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(), plevel->bkgd_image.c_str()); - texture_load(&img_bkgd, fname, IGNORE_ALPHA); + snprintf(fname, 1024, "%s/images/background/%s", datadir.c_str(), bkgd_image.c_str()); + img_bkgd = new Surface(fname, IGNORE_ALPHA); } else { - /* Quick hack to make sure an image is loaded, when we are freeing it afterwards. */# - level_load_image(&img_bkgd, plevel->theme,"solid0.png", IGNORE_ALPHA); + /* Quick hack to make sure an image is loaded, when we are freeing it afterwards. */ + load_image(&img_bkgd, theme,"solid0.png", IGNORE_ALPHA); } } -/* Free graphics data for this level: */ - -void level_free_gfx(void) +void +Level::free_gfx() { - int i; - - for (i = 0; i < 2; i++) - { - texture_free(&img_brick[i]); - } - for (i = 0; i < 4; i++) - { - texture_free(&img_solid[i]); - texture_free(&img_bkgd_tile[0][i]); - texture_free(&img_bkgd_tile[1][i]); - } - - 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) +void +Level::load_image(Surface** ptexture, string theme,const char * file, int use_alpha) { char fname[1024]; @@ -622,84 +641,90 @@ void level_load_image(texture_type* ptexture, string theme,const char * file, i 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) */ -void level_change_size (st_level* plevel, int new_width) +void +Level::change_size (int new_width) { if(new_width < 21) new_width = 21; - tilemap_change_size((unsigned int***)&plevel->ia_tiles,new_width,plevel->width); - tilemap_change_size((unsigned int***)&plevel->dn_tiles,new_width,plevel->width); - tilemap_change_size((unsigned int***)&plevel->bg_tiles,new_width,plevel->width); - tilemap_change_size((unsigned int***)&plevel->fg_tiles,new_width,plevel->width); - plevel->width = new_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); + } -/* Edit a piece of the map! */ + width = new_width; +} -void level_change(st_level* plevel, float x, float y, int tm, unsigned int c) +void +Level::change(float x, float y, int tm, unsigned int c) { - int xx, yy; - - yy = ((int)y / 32); - xx = ((int)x / 32); + int yy = ((int)y / 32); + int xx = ((int)x / 32); - if (yy >= 0 && yy < 15 && xx >= 0 && xx <= plevel->width) + if (yy >= 0 && yy < 15 && xx >= 0 && xx <= width) { switch(tm) { - case 0: - plevel->bg_tiles[yy][xx] = c; - case 1: - plevel->ia_tiles[yy][xx] = c; - case 2: - plevel->dn_tiles[yy][xx] = c; - case 4: - plevel->fg_tiles[yy][xx] = c; + case TM_BG: + bg_tiles[yy][xx] = c; + break; + case TM_IA: + ia_tiles[yy][xx] = c; + break; + case TM_FG: + fg_tiles[yy][xx] = c; + break; } } } -/* Free music data for this level: */ - -void level_free_song(void) +void +Level::free_song(void) { free_music(level_song); free_music(level_song_fast); } -/* Load music: */ - -void level_load_song(st_level* plevel) +void +Level::load_song() { + char* song_path; + char* song_subtitle; - char * song_path; - char * song_subtitle; - - level_song = load_song(datadir + "/music/" + plevel->song_title); + level_song = ::load_song(datadir + "/music/" + song_title); song_path = (char *) malloc(sizeof(char) * datadir.length() + - strlen(plevel->song_title.c_str()) + 8 + 5); - song_subtitle = strdup(plevel->song_title.c_str()); + strlen(song_title.c_str()) + 8 + 5); + song_subtitle = strdup(song_title.c_str()); strcpy(strstr(song_subtitle, "."), "\0"); - sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(), song_subtitle, strstr(plevel->song_title.c_str(), ".")); - level_song_fast = load_song(song_path); + sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(), + song_subtitle, strstr(song_title.c_str(), ".")); + level_song_fast = ::load_song(song_path); free(song_subtitle); free(song_path); } + +unsigned int +Level::gettileid(float x, float y) +{ + int xx, yy; + unsigned int c; + + yy = ((int)y / 32); + xx = ((int)x / 32); + + if (yy >= 0 && yy < 15 && xx >= 0 && xx <= width) + c = ia_tiles[yy][xx]; + else + c = 0; + + return c; +} + +/* EOF */