using namespace std;
-texture_type img_bkgd, img_bkgd_tile[2][4], img_solid[4], img_brick[2];
-
st_subset::st_subset()
{
levels = 0;
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);
}
}
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()
{
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_red = 0;
- bkgd_green = 0;
- bkgd_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';
}
}
-/* Load data for this level: */
-/* Returns -1, if the loading of the level failed. */
int
-Level::load(const char *subset, int level)
+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 load(filename);
}
int
-Level::load(const char* filename)
+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;
}
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<int> ia_tm;
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_red", &bkgd_red);
- reader.read_int("bkgd_green", &bkgd_green);
- reader.read_int("bkgd_blue", &bkgd_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);
reader.read_string("theme", &theme);
reader.read_string("music", &song_title);
reader.read_string("background", &bkgd_image);
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;
}
}
- // FIXME: Set the global gravity to the latest loaded level's gravity
- ::gravity = gravity;
-
// Mark the end position of this level!
// FIXME: -10 is a rather random value, we still need some kind of
// real levelend gola
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 %d)\n", bkgd_red);
- fprintf(fi," (bkgd_green %d)\n", bkgd_green);
- fprintf(fi," (bkgd_blue %d)\n", bkgd_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);
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();
+ }
name.clear();
+ author.clear();
theme.clear();
song_title.clear();
bkgd_image.clear();
badguy_data.clear();
}
-/* Load graphics: */
-
void
Level::load_gfx()
{
- level_load_image(&img_brick[0],theme,"brick0.png", IGNORE_ALPHA);
- level_load_image(&img_brick[1],theme,"brick1.png", IGNORE_ALPHA);
-
- level_load_image(&img_solid[0],theme,"solid0.png", USE_ALPHA);
- level_load_image(&img_solid[1],theme,"solid1.png", USE_ALPHA);
- level_load_image(&img_solid[2],theme,"solid2.png", USE_ALPHA);
- level_load_image(&img_solid[3],theme,"solid3.png", USE_ALPHA);
-
- level_load_image(&img_bkgd_tile[0][0],theme,"bkgd-00.png", USE_ALPHA);
- level_load_image(&img_bkgd_tile[0][1],theme,"bkgd-01.png", USE_ALPHA);
- level_load_image(&img_bkgd_tile[0][2],theme,"bkgd-02.png", USE_ALPHA);
- level_load_image(&img_bkgd_tile[0][3],theme,"bkgd-03.png", USE_ALPHA);
-
- level_load_image(&img_bkgd_tile[1][0],theme,"bkgd-10.png", USE_ALPHA);
- level_load_image(&img_bkgd_tile[1][1],theme,"bkgd-11.png", USE_ALPHA);
- level_load_image(&img_bkgd_tile[1][2],theme,"bkgd-12.png", USE_ALPHA);
- level_load_image(&img_bkgd_tile[1][3],theme,"bkgd-13.png", USE_ALPHA);
-
if(!bkgd_image.empty())
{
char fname[1024];
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
{
- /* Quick hack to make sure an image is loaded, when we are freeing it afterwards. */#
- level_load_image(&img_bkgd, 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];
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) */
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;
}
}
}
-/* 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()
{
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(song_title.c_str(), "."));
+ 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 gettileid(float x, float y)
+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 <= current_level.width)
- c = current_level.ia_tiles[yy][xx];
+ if (yy >= 0 && yy < 15 && xx >= 0 && xx <= width)
+ c = ia_tiles[yy][xx];
else
c = 0;
return c;
}
-Tile* gettile(float x, float y)
-{
- return TileManager::instance()->get(gettileid(x, y));
-}
-
-bool issolid(float x, float y)
-{
- Tile* tile = TileManager::instance()->get(gettileid(x,y));
- return tile && tile->solid;
-}
-
-bool isbrick(float x, float y)
-{
- Tile* tile = TileManager::instance()->get(gettileid(x,y));
- return tile && tile->brick;
-}
-
-bool isice(float x, float y)
-{
- Tile* tile = TileManager::instance()->get(gettileid(x,y));
- return tile && tile->ice;
-}
-
-bool isfullbox(float x, float y)
-{
- Tile* tile = TileManager::instance()->get(gettileid(x,y));
- return tile && tile->fullbox;
-}
-
-bool isdistro(float x, float y)
-{
- Tile* tile = TileManager::instance()->get(gettileid(x,y));
- return tile && tile->distro;
-}
-
/* EOF */
projects / supertux.git / blobdiff