Included supertux.h stuff into it.

[supertux.git] / src / level.h

diff --git a/src/level.h b/src/level.h
index 2a4526d..96fcb1f 100644 (file)
--- a/src/level.h
+++ b/src/level.h
@@ -50,11 +50,11 @@ enum TileMapType {
  TM_FG
  };
 
-extern texture_type img_bkgd;
-
 class Level 
 {
  public:
+  texture_type img_bkgd;
+
   std::string name;
   std::string theme;
   std::string song_title;
@@ -68,6 +68,7 @@ class Level
   int bkgd_green;
   int bkgd_blue;
   int width;
+  int  endpos;
   float gravity;
 
   std::vector<BadGuyData> badguy_data;
@@ -80,14 +81,16 @@ class Level
 
   /** Load data for this level: 
       Returns -1, if the loading of the level failed. */
-  int  load(const char* subset, int level);
+  int  load(const std::string& subset, int level);
 
   /** Load data for this level: 
       Returns -1, if the loading of the level failed. */
   int  load(const std::string& filename);
 
   void load_gfx();
+  
   void load_song();
+  void free_song();
 
   void save(const char* subset, int level);
 
@@ -99,10 +102,10 @@ class Level
 
   /** Return the id of the tile at position x/y */
   unsigned int gettileid(float x, float y);
-};
 
-void level_load_image(texture_type* ptexture, std::string theme, const char * file, int use_alpha);
-void level_free_song();
-void level_free_gfx();
+  void free_gfx();
+
+  void load_image(texture_type* ptexture, std::string theme, const char * file, int use_alpha);
+};
 
 #endif /*SUPERTUX_LEVEL_H*/