X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.h;h=1f2fe9486c5efc35f1d50f7a593adff71470f7e5;hb=c2b5367f6f1d24f84ea26da553245128f241690e;hp=6ed8f36e611f9442b5b9f7cec68745bcd2586b27;hpb=84160722392a024dda42bd86ca9bd85b68c49457;p=supertux.git

diff --git a/src/level.h b/src/level.h
index 6ed8f36e6..1f2fe9486 100644
--- a/src/level.h
+++ b/src/level.h
@@ -25,19 +25,23 @@
 #include "texture.h"
 #include "badguy.h"
 #include "lispreader.h"
+#include "musicref.h"
+#include "gameobjs.h"
 
 class Tile;
+class World;
 
 /** This type holds meta-information about a level-subset. 
     It could be extended to handle manipulation of subsets. */
-class st_subset
+class LevelSubset
   {
   public:
-    st_subset();
+    LevelSubset();
+    ~LevelSubset();
+
     static void create(const std::string& subset_name);
     void load(char *subset);
     void save();
-    void free();
 
     std::string name;
     std::string title;
@@ -68,33 +72,36 @@ class Level
 {
  public:
   Surface* img_bkgd;
+  MusicRef level_song;
+  MusicRef level_song_fast;
 
   std::string name;
   std::string author;
-  std::string theme;
   std::string song_title;
   std::string bkgd_image;
   std::string particle_system;
-  std::vector<unsigned int> bg_tiles[15]; /* Tiles in the background */
-  std::vector<unsigned int> ia_tiles[15]; /* Tiles which can interact in the game (solids for example)*/
-  std::vector<unsigned int> fg_tiles[15]; /* Tiles in the foreground */
+  std::vector<unsigned int> bg_tiles; /* Tiles in the background */
+  std::vector<unsigned int> ia_tiles; /* Tiles which can interact in the game (solids for example)*/
+  std::vector<unsigned int> fg_tiles; /* Tiles in the foreground */
+//  std::vector<unsigned int> bg_tiles[15]; /* Tiles in the background */
+//  std::vector<unsigned int> ia_tiles[15]; /* Tiles which can interact in the game (solids for example)*/
+//  std::vector<unsigned int> fg_tiles[15]; /* Tiles in the foreground */
   int time_left;
   Color bkgd_top;
   Color bkgd_bottom;
   int width;
-  int start_pos_x;
-  int start_pos_y;
-  int  endpos;
+  int height;
+  int bkgd_speed;
+  Vector start_pos;
   float gravity;
 
-  std::vector<BadGuyData> badguy_data;
-
   /** A collection of points to which Tux can be reset after a lost live */
   std::vector<ResetPoint> reset_points;
  public:
   Level();
-  Level(const std::string& subset, int level);
-  Level(const std::string& filename);
+  Level(const std::string& subset, int level, World* world);
+  Level(const std::string& filename, World* world);
+  ~Level();
 
   /** Will the Level structure with default values */
   void init_defaults();
@@ -103,29 +110,39 @@ class Level
   void cleanup();
 
   /** Load data for this level: 
-      Returns -1, if the loading of the level failed. */
-  int  load(const std::string& subset, int level);
+      Returns -1, if the loading of the level failed. 
+      XXX the world parameter is a temporary hack   
+  */
+  int  load(const std::string& subset, int level, World* world);
 
   /** Load data for this level: 
-      Returns -1, if the loading of the level failed. */
-  int  load(const std::string& filename);
+      Returns -1, if the loading of the level failed. 
+      XXX the world parameter is a temporary hack
+   */
+  int  load(const std::string& filename, World* world);
 
   void load_gfx();
-  void free_gfx();
   
   void load_song();
   void free_song();
+  MusicRef get_level_music();
+  MusicRef get_level_music_fast();
 
-  void save(const char* subset, int level);
+  // XXX the world parameter is a temporary hack
+  void save(const std::string& subset, int level, World* world);
 
   /** Edit a piece of the map! */
   void change(float x, float y, int tm, unsigned int c);
 
-  /** Resize the level to a new width */
-  void change_size (int new_width);
+  /** Resize the level to a new width/height */
+  void resize(int new_width, int new_height);
 
   /** Return the id of the tile at position x/y */
-  unsigned int gettileid(float x, float y);
+  unsigned int gettileid(float x, float y) const;
+  /** returns the id of the tile at position x,y
+   * (these are logical and not pixel coordinates)
+   */
+  unsigned int get_tile_at(int x, int y) const;
 
   void load_image(Surface** ptexture, std::string theme, const char * file, int use_alpha);
 };