snprintf(filename, 1024, "%s/levels/%s/info", st_dir, subset);
if(!faccessible(filename))
- snprintf(filename, 1024, "%s/levels/%s/info", DATA_PREFIX, subset);
+ snprintf(filename, 1024, "%s/levels/%s/info", datadir.c_str(), subset);
if(faccessible(filename))
{
fi = fopen(filename, "r");
printf("World: Read error in %s",filename);
}
- if (strcmp(lisp_symbol(cur), "level-subset") == 0)
+ if (strcmp(lisp_symbol(cur), "supertux-level-subset") == 0)
{
parse(lisp_cdr(root_obj));
}
else
{
- snprintf(filename, 1024, "%s/images/status/level-subset-info.png", DATA_PREFIX);
+ snprintf(filename, 1024, "%s/images/status/level-subset-info.png", datadir.c_str());
texture_load(&image,filename,IGNORE_ALPHA);
}
}
snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset,i);
if(!faccessible(filename))
{
- snprintf(filename, 1024, "%s/levels/%s/level%d.stl", DATA_PREFIX, subset,i);
+ snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset,i);
if(!faccessible(filename))
break;
}
fcreatedir(filename.c_str());
filename = string(st_dir) + "/levels/" + name + "/info";
if(!fwriteable(filename.c_str()))
- filename = string(DATA_PREFIX) + "/levels/" + name + "/info";
+ filename = datadir + "/levels/" + name + "/info";
if(fwriteable(filename.c_str()))
{
fi = fopen(filename.c_str(), "w");
/* Write header: */
fprintf(fi,";SuperTux-Level-Subset\n");
- fprintf(fi,"(level-subset\n");
+ fprintf(fi,"(supertux-level-subset\n");
/* Save title info: */
fprintf(fi," (title \"%s\")\n", title.c_str());
for(i = 0; i < 15; ++i)
{
- plevel->tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int));
- plevel->tiles[i][plevel->width] = (unsigned int) '\0';
+ 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->tiles[i][y] = (unsigned int) '.';
- plevel->tiles[i][plevel->width] = (unsigned int) '\0';
+ 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';
}
}
/* 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(st_level* plevel, const char *subset, int level)
{
char filename[1024];
snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset, level);
if(!faccessible(filename))
- snprintf(filename, 1024, "%s/levels/%s/level%d.stl", DATA_PREFIX, subset, level);
+ snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset, level);
return level_load(plevel, filename);
}
int level_load(st_level* plevel, const char* filename)
{
- int x, y;
FILE * fi;
lisp_object_t* root_obj = 0;
fi = fopen(filename, "r");
printf("World: Parse Error in file %s", filename);
}
- vector<int> vi;
+ vector<int> ia_tm;
+ vector<int> dn_tm;
+ vector<int> bg_tm;
+ vector<int> fg_tm;
+ int version = 0;
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_string("theme", &plevel->theme);
reader.read_string("music", &plevel->song_title);
reader.read_string("background", &plevel->bkgd_image);
- reader.read_int_vector("tilemap", &vi);
+ reader.read_string("particle_system", &plevel->particle_system);
+ reader.read_int_vector("background-tm", &bg_tm);
+
+ if (!reader.read_int_vector("interactive-tm", &ia_tm))
+ reader.read_int_vector("tilemap", &ia_tm);
+
+ reader.read_int_vector("dynamic-tm", &dn_tm);
+ reader.read_int_vector("foreground-tm", &fg_tm);
+
+ // Convert old levels to the new tile numbers
+ if (version == 0)
+ {
+ int transtable[256];
+ transtable[(int)'.'] = 0;
+ transtable[(int)'0'] = 0;
+ transtable[(int)'1'] = 1;
+ transtable[(int)'2'] = 2;
+ transtable[(int)'x'] = 77;
+ transtable[(int)'X'] = 77;
+ transtable[(int)'y'] = 78;
+ transtable[(int)'Y'] = 78;
+ transtable[(int)'A'] = 83;
+ transtable[(int)'B'] = 102;
+ transtable[(int)'!'] = 103;
+ transtable[(int)'a'] = 84;
+ transtable[(int)'C'] = 85;
+ transtable[(int)'D'] = 86;
+ transtable[(int)'E'] = 87;
+ transtable[(int)'F'] = 88;
+ transtable[(int)'c'] = 89;
+ transtable[(int)'d'] = 90;
+ transtable[(int)'e'] = 91;
+ transtable[(int)'f'] = 92;
+
+ transtable[(int)'G'] = 93;
+ transtable[(int)'H'] = 94;
+ transtable[(int)'I'] = 95;
+ transtable[(int)'J'] = 96;
+
+ transtable[(int)'g'] = 97;
+ transtable[(int)'h'] = 98;
+ transtable[(int)'i'] = 99;
+ transtable[(int)'j'] = 100
+;
+ transtable[(int)'#'] = 11;
+ transtable[(int)'['] = 13;
+ transtable[(int)'='] = 14;
+ transtable[(int)']'] = 15;
+ transtable[(int)'$'] = 82;
+ transtable[(int)'^'] = 76;
+ transtable[(int)'*'] = 80;
+ transtable[(int)'|'] = 79;
+ transtable[(int)'\\'] = 81;
+ transtable[(int)'&'] = 75;
+
+ for(std::vector<int>::iterator i = ia_tm.begin(); i != ia_tm.end(); ++i)
+ if (*i < 256)
+ *i = transtable[*i];
+ else
+ puts("Error: Value to high, conversion will fail");
+ }
+ }
+
+ 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) );
}
-
-
- int i;
- for( i = 0; i < 15; ++i)
- plevel->tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) );
- i = 0;
+ int i = 0;
int j = 0;
- for(vector<int>::iterator it = vi.begin(); it != vi.end(); ++it, ++i)
+ for(vector<int>::iterator it = ia_tm.begin(); it != ia_tm.end(); ++it, ++i)
+ {
+ plevel->ia_tiles[j][i] = (*it);
+ if(i == plevel->width - 1)
+ {
+ i = -1;
+ ++j;
+ }
+ }
+
+ i = j = 0;
+ for(vector<int>::iterator it = dn_tm.begin(); it != dn_tm.end(); ++it, ++i)
{
- plevel->tiles[j][i] = (*it);
+ plevel->dn_tiles[j][i] = (*it);
if(i == plevel->width - 1)
{
i = -1;
}
}
- /* Set the global gravity to the latest loaded level's gravity */
- gravity = plevel->gravity;
+ i = j = 0;
+ for(vector<int>::iterator it = bg_tm.begin(); it != bg_tm.end(); ++it, ++i)
+ {
- /* Mark the end position of this level! - Is a bit wrong here thought */
+ plevel->bg_tiles[j][i] = (*it);
+ if(i == plevel->width - 1)
+ {
+ i = -1;
+ ++j;
+ }
+ }
- for (y = 0; y < 15; ++y)
+ i = j = 0;
+ for(vector<int>::iterator it = fg_tm.begin(); it != fg_tm.end(); ++it, ++i)
{
- for (x = 0; x < plevel->width; ++x)
+
+ plevel->fg_tiles[j][i] = (*it);
+ if(i == plevel->width - 1)
{
- if(plevel->tiles[y][x] == '|')
- {
- if(x*32 > endpos)
- endpos = x*32;
- }
+ 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;
+ }
+ }
+ }*/
+
fclose(fi);
return 0;
}
fcreatedir(str);
snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset, level);
if(!fwriteable(filename))
- snprintf(filename, 1024, "%s/levels/%s/level%d.stl", DATA_PREFIX, subset, level);
+ snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset, level);
fi = fopen(filename, "w");
if (fi == NULL)
}
- /* Write header: */
- fprintf(fi,";SuperTux-Level\n");
- fprintf(fi,"(supertux-level\n");
-
- 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," (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," (tilemap ");
-
+ /* Write header: */
+ fprintf(fi,";SuperTux-Level\n");
+ 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," (background-tm ");
+
+ for(y = 0; y < 15; ++y)
+ {
+ for(i = 0; i < plevel->width; ++i)
+ fprintf(fi," %d ", plevel->bg_tiles[y][i]);
+ }
+
+ fprintf( fi,")\n");
+ fprintf(fi," (interactive-tm ");
+
+ for(y = 0; y < 15; ++y)
+ {
+ for(i = 0; i < plevel->width; ++i)
+ fprintf(fi," %d ", plevel->ia_tiles[y][i]);
+ }
+
+ fprintf( fi,")\n");
+ fprintf(fi," (dynamic-tm ");
+
+ for(y = 0; y < 15; ++y)
+ {
+ for(i = 0; i < plevel->width; ++i)
+ fprintf(fi," %d ", plevel->dn_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->tiles[y][i]);
+ for(i = 0; i < plevel->width; ++i)
+ fprintf(fi," %d ", plevel->fg_tiles[y][i]);
}
-
- fprintf( fi,")");
- fprintf( fi,")\n");
+
+ fprintf( fi,")");
+ fprintf( fi,")\n");
fclose(fi);
}
{
int i;
for(i=0; i < 15; ++i)
- free(plevel->tiles[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();
char fname[1024];
snprintf(fname, 1024, "%s/background/%s", st_dir, plevel->bkgd_image.c_str());
if(!faccessible(fname))
- snprintf(fname, 1024, "%s/images/background/%s", DATA_PREFIX, plevel->bkgd_image.c_str());
+ snprintf(fname, 1024, "%s/images/background/%s", datadir.c_str(), plevel->bkgd_image.c_str());
texture_load(&img_bkgd, fname, IGNORE_ALPHA);
}
else
snprintf(fname, 1024, "%s/themes/%s/%s", st_dir, theme.c_str(), file);
if(!faccessible(fname))
- snprintf(fname, 1024, "%s/images/themes/%s/%s", DATA_PREFIX, theme.c_str(), file);
+ 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;
+ }
+}
+
+/* Change the size of a level (width) */
+void level_change_size (st_level* plevel, 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;
+
+}
+
/* Edit a piece of the map! */
-void level_change(st_level* plevel, float x, float y, unsigned char c)
+void level_change(st_level* plevel, float x, float y, int tm, unsigned int c)
{
int xx, yy;
xx = ((int)x / 32);
if (yy >= 0 && yy < 15 && xx >= 0 && xx <= plevel->width)
- plevel->tiles[yy][xx] = c;
+ {
+ 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;
+ }
+ }
}
/* Free music data for this level: */
char * song_path;
char * song_subtitle;
- song_path = (char *) malloc(sizeof(char) * (strlen(DATA_PREFIX) +
- strlen(plevel->song_title.c_str()) + 8));
- sprintf(song_path, "%s/music/%s", DATA_PREFIX, plevel->song_title.c_str());
- level_song = load_song(song_path);
- free(song_path);
-
+ level_song = load_song(datadir + "/music/" + plevel->song_title);
- song_path = (char *) malloc(sizeof(char) * (strlen(DATA_PREFIX) +
- strlen(plevel->song_title.c_str()) + 8 + 5));
+ song_path = (char *) malloc(sizeof(char) * datadir.length() +
+ strlen(plevel->song_title.c_str()) + 8 + 5);
song_subtitle = strdup(plevel->song_title.c_str());
strcpy(strstr(song_subtitle, "."), "\0");
- sprintf(song_path, "%s/music/%s-fast%s", DATA_PREFIX, song_subtitle, strstr(plevel->song_title.c_str(), "."));
+ 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);
free(song_subtitle);
free(song_path);
projects / supertux.git / blobdiff