X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.h;h=a5f5856fc19943c3d943f326794e8f95d737829a;hb=58bf708dc9f036b2c7d8d3edfdbfa62f0da3481a;hp=978ed3a5209a83f081294c5855d601e16e48a3df;hpb=308f11e38981077626fe0ea9887094f3c28b02f9;p=supertux.git

diff --git a/src/tile.h b/src/tile.h
index 978ed3a52..a5f5856fc 100644
--- a/src/tile.h
+++ b/src/tile.h
@@ -17,21 +17,15 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #ifndef TILE_H
 #define TILE_H
 
-#include <set>
-#include <map>
 #include <vector>
+#include "video/surface.h"
+#include "math/rectangle.h"
+#include "lisp/lisp.h"
 
-#include "screen/texture.h"
-#include "globals.h"
-#include "lispreader.h"
-#include "setup.h"
-#include "vector.h"
-
-class LispReader;
+using namespace SuperTux;
 
 /**
 Tile Class
@@ -39,56 +33,84 @@ Tile Class
 class Tile
 {
 public:
-  Tile();
-  ~Tile();
+  /// bitset for tile attributes
+  enum {
+    /** solid tile that is indestructable by Tux */                         
+    SOLID     = 0x0001,
+    /** uni-directional solid tile */
+    UNISOLID  = 0x0002,
+    /** a brick that can be destroyed by jumping under it */
+    BRICK     = 0x0004,
+    /** an ice brick that makes tux sliding more than usual */
+    ICE       = 0x0008,
+    /** a water tile in which tux starts to swim */                         
+    WATER     = 0x0010,
+    /** a tile that hurts the player if he touches it */
+    SPIKE     = 0x0020,
+    /** Bonusbox, content is stored in \a data */
+    FULLBOX   = 0x0040,
+    /** Tile is a coin */
+    COIN      = 0x0080,
+    /** the level should be finished when touching a goaltile.
+     * if data is 0 then the endsequence should be triggered, if data is 1
+     * then we can finish the level instantly.
+     */
+    GOAL      = 0x0100,
+    /** slope tile */
+    SLOPE     = 0x0200,
+  };
 
-  /// parses the tile and returns it's id number
-  int read(LispReader& reader);
+  /// worldmap flags
+  enum {
+    WORLDMAP_NORTH = 0x0001,
+    WORLDMAP_SOUTH = 0x0002,
+    WORLDMAP_EAST  = 0x0004,
+    WORLDMAP_WEST  = 0x0008,
+    
+    WORLDMAP_STOP  = 0x0010
+  };
+  
+private:
+  unsigned int id;
 
-  int id;
+  struct ImageSpec {
+    ImageSpec(const std::string& newfile, const Rectangle& newrect)
+      : file(newfile), rect(newrect)
+    { }
 
-  std::vector<Surface*> images;
-  std::vector<Surface*> editor_images;
-  
-  /// bitset for tileflags
-  enum {
-      /** solid tile that is indestructable by Tux */
-      SOLID     = 0x0001,
-      /** uni-directional solid tile */
-      UNISOLID  = 0x0002,
-      /** a brick that can be destroyed by jumping under it */
-      BRICK     = 0x0004,
-      /** an ice brick that makes tux sliding more than usual */
-      ICE       = 0x0008,
-      /** a water tile in which tux starts to swim */
-      WATER     = 0x0010,
-      /** a tile that hurts the player if he touches it */
-      SPIKE     = 0x0020,
-      /** Bonusbox, content is stored in \a data */
-      FULLBOX   = 0x0040,
-      /** Tile is a coin */
-      COIN      = 0x0080,
-      /** the level should be finished when touching a goaltile.
-       * if data is 0 then the endsequence should be triggered, if data is 1
-       * then we can finish the level instantly.
-       */
-      GOAL      = 0x0100
+    std::string file;
+    Rectangle rect;
   };
+  std::vector<ImageSpec> imagespecs;
+  std::vector<Surface*> images;
 
+  std::string editor_imagefile;
+  Surface* editor_image;
+  
   /** tile attributes */
   Uint32 attributes;
   
   /** General purpose data attached to a tile (content of a box, type of coin)*/
   int data;
 
-  /** Id of the tile that is going to replace this tile once it has
-      been collected or jumped at */
-  int next_tile;
+  float anim_fps;
 
-  int anim_speed;
+public:
+  ~Tile();
   
-  /** Draw a tile on the screen: */
-  static void draw(const Vector& pos, unsigned int c, Uint8 alpha = 255);
+  /** Draw a tile on the screen */
+  void draw(DrawingContext& context, const Vector& pos, int layer) const;
+
+  Surface* get_editor_image() const;
+
+  unsigned int getID() const
+  { return id; }
+
+  Uint32 getAttributes() const
+  { return attributes; }
+
+  int getData() const
+  { return data; }
 
   /// returns the width of the tile in pixels
   int getWidth() const
@@ -105,55 +127,16 @@ public:
       return 0;
     return images[0]->h;
   }
-};
-
-struct TileGroup
-{
-  friend bool operator<(const TileGroup& lhs, const TileGroup& rhs)
-  { return lhs.name < rhs.name; };
-  friend bool operator>(const TileGroup& lhs, const TileGroup& rhs)
-  { return lhs.name > rhs.name; };
 
-  std::string name;
-  std::vector<int> tiles;
-};
+protected:
+  friend class TileManager;
+  Tile();
 
-class TileManager
-{
- private:
-  TileManager();
-  ~TileManager();
-  
-  std::vector<Tile*> tiles;
-  static TileManager* instance_ ;
-  static std::set<TileGroup>* tilegroups_;
-  void load_tileset(std::string filename);
+  void load_images(const std::string& tilesetpath);
 
-  std::string current_tileset;
-  
- public:
-  static TileManager* instance()
-  { return instance_ ? instance_ : instance_ = new TileManager(); }
-  static void destroy_instance()
-  { delete instance_; instance_ = 0; }
-
-  void draw_tile(DrawingContext& context, unsigned int id,
-      const Vector& pos, int layer);
-  
-  static std::set<TileGroup>* tilegroups() { if(!instance_) { instance_ = new TileManager(); } return tilegroups_ ? tilegroups_ : tilegroups_ = new std::set<TileGroup>; }
-  Tile* get(unsigned int id) {
-    if(id < tiles.size())
-      {
-        return tiles[id]; 
-      }
-    else
-      {
-        // Never return 0, but return the 0th tile instead so that
-        // user code doesn't have to check for NULL pointers all over
-        // the place
-        return tiles[0]; 
-      } 
-  }
+  /// parses the tile and returns it's id number
+  void parse(const lisp::Lisp& reader);
+  void parse_images(const lisp::Lisp& cur);
 };
 
 #endif