moved savelevel() code to level.h/c where it belongs to. :)

SVN-Revision: 117

diff --git a/src/level.c b/src/level.c
index 50aa6b6..b9f0ea4 100644 (file)
--- a/src/level.c
+++ b/src/level.c
@@ -116,6 +116,57 @@ void loadlevel(st_level* plevel, char *subset, int level)
 
 }
 
+/* Save data for level: */
+
+void savelevel(st_level* plevel, char * subset, int level)
+{
+  FILE * fi;
+  char * filename;
+  int y;
+  char str[80];
+
+  /* Save data file: */
+
+  filename = (char *) malloc(sizeof(char) * (strlen(DATA_PREFIX) + 20) + strlen(subset));
+  sprintf(filename, "%s/levels/%s/level%d.dat", DATA_PREFIX, subset, level);
+  fi = fopen(filename, "w");
+  if (fi == NULL)
+    {
+      perror(filename);
+      st_shutdown();
+      free(filename);
+      exit(-1);
+    }
+  free(filename);
+
+  fputs(plevel->name, fi);
+  fputs("\n", fi);
+  fputs(plevel->theme, fi);
+  fputs("\n", fi);
+  sprintf(str, "%d\n", plevel->time_left);     /* time */
+  fputs(str, fi);
+  fputs(plevel->song_title, fi);       /* song filename */
+  fputs("\n",fi);
+  fputs(plevel->bkgd_image, fi);       /* background image */  
+  sprintf(str, "\n%d\n", plevel->bkgd_red);    /* red background color */
+  fputs(str, fi);
+  sprintf(str, "%d\n", plevel->bkgd_green);    /* green background color */
+  fputs(str, fi);
+  sprintf(str, "%d\n", plevel->bkgd_blue);     /* blue background color */
+  fputs(str, fi);
+  sprintf(str, "%d\n", plevel->width); /* level width */
+  fputs(str, fi);
+
+  for(y = 0; y < 15; ++y)
+    {
+      fputs(plevel->tiles[y], fi);
+      fputs("\n", fi);
+    }
+
+  fclose(fi);
+}
+
+
 /* Unload data for this level: */
 
 void unloadlevel(st_level* plevel)

diff --git a/src/level.h b/src/level.h
index 1b31fd2..a21a0b2 100644 (file)
--- a/src/level.h
+++ b/src/level.h
@@ -34,6 +34,7 @@ typedef struct st_level /*It is easier to read the sources IMHO, if we don't wri
 texture_type img_bkgd, img_bkgd_tile[2][4], img_solid[4], img_brick[2];
   
 void loadlevel(st_level* plevel, char * subset, int level);
+void savelevel(st_level* plevel, char * subset, int level);
 void unloadlevel(st_level* plevel);
 void loadlevelgfx(st_level* plevel);
 void unloadlevelgfx();

diff --git a/src/leveleditor.c b/src/leveleditor.c
index c182c1d..7f014b1 100644 (file)
--- a/src/leveleditor.c
+++ b/src/leveleditor.c
@@ -554,62 +554,6 @@ int xx, yy;
         bad_guys[i].base.alive = NO;
 }
 
-/* Save data for this level: */
-void savelevel(void)
-{
-  FILE * fi;
-  char * filename;
-  int y;
-  char str[80];
-
-  /* Save data file: */
-
-  filename = (char *) malloc(sizeof(char) * (strlen(DATA_PREFIX) + 20) + strlen(level_subset));
-  sprintf(filename, "%s/levels/%s/level%d.dat", DATA_PREFIX, level_subset, level);
-  fi = fopen(filename, "w");
-  if (fi == NULL)
-    {
-      perror(filename);
-      st_shutdown();
-      free(filename);
-      exit(-1);
-    }
-  free(filename);
-
-
-  /* sptrinf("# Level created by SuperTux built-in editor", fi); */
-
-  fputs(current_level.name, fi);
-  fputs("\n", fi);
-  fputs(current_level.theme, fi);
-  fputs("\n", fi);
-  sprintf(str, "%d\n", current_level.time_left);       /* time */
-  fputs(str, fi);
-  fputs(current_level.song_title, fi); /* song filename */
-  fputs("\n",fi);
-  fputs(current_level.bkgd_image, fi); /* background image */  
-  sprintf(str, "\n%d\n", current_level.bkgd_red);      /* red background color */
-  fputs(str, fi);
-  sprintf(str, "%d\n", current_level.bkgd_green);      /* green background color */
-  fputs(str, fi);
-  sprintf(str, "%d\n", current_level.bkgd_blue);       /* blue background color */
-  fputs(str, fi);
-  sprintf(str, "%d\n", current_level.width);   /* level width */
-  fputs(str, fi);
-
-  for(y = 0; y < 15; ++y)
-    {
-      fputs(current_level.tiles[y], fi);
-      fputs("\n", fi);
-    }
-
-  fclose(fi);
-
-  text_drawf(&gold_text, "SAVED!", 0, 240, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
-  flipscreen();
-  SDL_Delay(1000);
-}
-
 void showhelp()
 {
   SDL_Event event;

diff --git a/src/leveleditor.h b/src/leveleditor.h
index cd1bb38..a22be9a 100644 (file)
--- a/src/leveleditor.h
+++ b/src/leveleditor.h
@@ -1,6 +1,5 @@
 
 int level_editor_started;
 int leveleditor();
-void savelevel(void);
 void newlevel(void);
 void selectlevel(void);

diff --git a/src/menu.c b/src/menu.c
index 7971f7a..8431cdb 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -24,6 +24,7 @@
 #include "screen.h"
 #include "setup.h"
 #include "sound.h"
+#include "scene.h"
 #include "leveleditor.h"
 #include "gameloop.h"
 #include "timer.h"
@@ -390,7 +391,10 @@ int menu_leveleditor(void)
       if(menuaction == MN_HIT) /* Save the current level in the level-editor. */
         {
           show_menu = 0;
-          savelevel();
+          savelevel(&current_level,"default",level);
+         text_drawf(&gold_text, "SAVED!", 0, 240, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
+          flipscreen();
+          SDL_Delay(1000);
         }
     }
   else