- replaced YES/NO with true/false

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index a484224..d8c2085 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -87,7 +87,7 @@ void st_subset::load(char *subset)
 
   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");
@@ -111,7 +111,7 @@ void st_subset::load(char *subset)
           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));
 
@@ -126,7 +126,7 @@ void st_subset::load(char *subset)
         }
       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);
         }
     }
@@ -134,10 +134,10 @@ void st_subset::load(char *subset)
   for(i=1; i != -1; ++i)
     {
       /* Get the number of levels in this subset */
-      snprintf(filename, 1024, "%s/levels/%s/level%d.dat", st_dir, subset,i);
+      snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset,i);
       if(!faccessible(filename))
         {
-          snprintf(filename, 1024, "%s/levels/%s/level%d.dat", DATA_PREFIX, subset,i);
+          snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset,i);
           if(!faccessible(filename))
             break;
         }
@@ -156,7 +156,7 @@ void st_subset::save()
   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");
@@ -167,7 +167,7 @@ void st_subset::save()
 
       /* 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());
@@ -222,9 +222,9 @@ int level_load(st_level* plevel,const  char *subset, int level)
 
   /* Load data file: */
 
-  snprintf(filename, 1024, "%s/levels/%s/level%d.dat", st_dir, subset, level);
+  snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset, level);
   if(!faccessible(filename))
-    snprintf(filename, 1024, "%s/levels/%s/level%d.dat", DATA_PREFIX, subset, level);
+    snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset, level);
 
   return level_load(plevel, filename);
 }
@@ -252,12 +252,10 @@ int level_load(st_level* plevel, const char* filename)
 
   vector<int> vi;
 
-DEBUG_MSG("LLALAL");
-  if (strcmp(lisp_symbol(lisp_car(root_obj)), "level") == 0)
+  if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0)
     {
       LispReader reader(lisp_cdr(root_obj));
       
-      DEBUG_MSG("TAGAF");
       reader.read_int("width",  &plevel->width);
       reader.read_int("time",  &plevel->time_left);
       reader.read_int("bkgd_red",  &plevel->bkgd_red);
@@ -271,7 +269,6 @@ DEBUG_MSG("LLALAL");
       reader.read_int_vector("tilemap",  &vi);
     }
     
-    DEBUG_MSG("LOLOL");
     
   int i;
   for( i = 0; i < 15; ++i)
@@ -283,11 +280,10 @@ DEBUG_MSG("LLALAL");
     {
 
       plevel->tiles[j][i] = (*it);
-      if(i == plevel->width)
+      if(i == plevel->width - 1)
         {
-          i = 0;
+          i = -1;
           ++j;
-         DEBUG_MSG("joa");
         }
     }
 
@@ -324,9 +320,9 @@ void level_save(st_level* plevel,const  char * subset, int level)
   /* Save data file: */
   sprintf(str, "/levels/%s/", subset);
   fcreatedir(str);
-  snprintf(filename, 1024, "%s/levels/%s/level%d.dat", st_dir, subset, level);
+  snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset, level);
   if(!fwriteable(filename))
-    snprintf(filename, 1024, "%s/levels/%s/level%d.dat", 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)
@@ -339,7 +335,7 @@ void level_save(st_level* plevel,const  char * subset, int level)
 
         /* Write header: */
       fprintf(fi,";SuperTux-Level\n");
-      fprintf(fi,"(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());
@@ -407,7 +403,7 @@ void level_load_gfx(st_level *plevel)
       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
@@ -445,7 +441,7 @@ void level_load_image(texture_type* ptexture, string theme,const  char * file, i
 
   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);
 }
@@ -479,18 +475,13 @@ void level_load_song(st_level* plevel)
   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);