fix tiles being 1 pixel off their correct position

[supertux.git] / src / level.h

diff --git a/src/level.h b/src/level.h
index 3b08ec7..be51d5a 100644 (file)
--- a/src/level.h
+++ b/src/level.h
@@ -22,43 +22,42 @@
 #define SUPERTUX_LEVEL_H
 
 #include <string>
-#include "texture.h"
-#include "badguy.h"
+#include "screen/texture.h"
 #include "lispreader.h"
 #include "musicref.h"
 
 class Tile;
+class World;
 
 /** This type holds meta-information about a level-subset. 
     It could be extended to handle manipulation of subsets. */
 class LevelSubset
-  {
-  public:
-    LevelSubset();
-    ~LevelSubset();
-
-    static void create(const std::string& subset_name);
-    void load(char *subset);
-    void save();
-
-    std::string name;
-    std::string title;
-    std::string description;
-    Surface* image;
-    int levels;
+{
+public:
+  LevelSubset();
+  ~LevelSubset();
+
+  static void create(const std::string& subset_name);
+  void load(char *subset);
+  void save();
+
+  std::string name;
+  std::string title;
+  std::string description;
+  Surface* image;
+  int levels;
  
-  private:
-    void parse(lisp_object_t* cursor);
-  };
+private:
+  void parse(lisp_object_t* cursor);
+};
 
 #define LEVEL_NAME_MAX 20
 
-
 enum TileMapType {
  TM_BG,
  TM_IA,
  TM_FG
- };
+};
 
 struct ResetPoint
 {
@@ -68,7 +67,7 @@ struct ResetPoint
 
 class Level 
 {
- public:
+public:
   Surface* img_bkgd;
   MusicRef level_song;
   MusicRef level_song_fast;
@@ -78,32 +77,21 @@ class Level
   std::string song_title;
   std::string bkgd_image;
   std::string particle_system;
-  std::vector<std::vector<unsigned int> > bg_tiles; /* Tiles in the background */
-  std::vector<std::vector<unsigned int> > ia_tiles; /* Tiles which can interact in the game (solids for example)*/
-  std::vector<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 */
+  std::vector<unsigned int> bg_tiles; /* Tiles in the background */
+  std::vector<unsigned int> ia_tiles; /* solid Tiles in the game */
+  std::vector<unsigned int> fg_tiles; /* Tiles in the foreground */
   int time_left;
-  Color bkgd_top;
-  Color bkgd_bottom;
   int width;
   int height;
-  int bkgd_speed;
-  int start_pos_x;
-  int start_pos_y;
+  Vector start_pos;
   float gravity;
-  bool back_scrolling;
-  float hor_autoscroll_speed;
-
-  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 */
@@ -113,28 +101,30 @@ 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 load_song();
   void free_song();
   MusicRef get_level_music();
   MusicRef get_level_music_fast();
 
-  void save(const std::string& 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/height */
-  void change_width (int new_width);
-  void change_height (int new_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) const;