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());
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);
}
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)
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);
}
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);