- moved some more level_ stuff into the levelclass

[supertux.git] / src / level.h

diff --git a/src/level.h b/src/level.h
index dc946ad..dfb1c1e 100644 (file)
--- a/src/level.h
+++ b/src/level.h
@@ -50,14 +50,11 @@ enum TileMapType {
  TM_FG
  };
 
-extern texture_type img_bkgd;
-extern texture_type img_bkgd_tile[2][4];
-extern texture_type img_solid[4];
-extern texture_type img_brick[2];
-
 class Level 
 {
  public:
+  texture_type img_bkgd;
+
   std::string name;
   std::string theme;
   std::string song_title;
@@ -81,11 +78,18 @@ class Level
   /** Cleanup the level struct from allocated tile data and such */
   void cleanup();
 
+  /** Load data for this level: 
+      Returns -1, if the loading of the level failed. */
   int  load(const char* subset, int level);
-  int  load(const char* filename);
+
+  /** 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);
 
@@ -94,22 +98,14 @@ class Level
 
   /** Resize the level to a new width */
   void change_size (int new_width);
-};
 
-void level_load_image(texture_type* ptexture, std::string theme, const char * file, int use_alpha);
-void level_free_song();
-void level_free_gfx();
+  /** Return the id of the tile at position x/y */
+  unsigned int gettileid(float x, float y);
 
-/** Return the id of the tile at the given x/y coordinates */
-unsigned int gettileid(float x, float y);
+  void free_gfx();
 
-/** Return a pointer to the tile at the given x/y coordinates */
-Tile* gettile(float x, float y);
+  void load_image(texture_type* ptexture, std::string theme, const char * file, int use_alpha);
+};
 
-// Some little helper function to check for tile properties
-bool  issolid(float x, float y);
-bool  isbrick(float x, float y);
-bool  isice(float x, float y);
-bool  isfullbox(float x, float y);
 
 #endif /*SUPERTUX_LEVEL_H*/