projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed a few things from svn:ignore that are no longer needed to to switch to Cmake
[supertux.git]
/
src
/
tile.hpp
diff --git
a/src/tile.hpp
b/src/tile.hpp
index
f0668d5
..
fd1f69a
100644
(file)
--- a/
src/tile.hpp
+++ b/
src/tile.hpp
@@
-29,6
+29,7
@@
namespace lisp { class Lisp; }
namespace lisp { class Lisp; }
+class TileSet;
class DrawingContext;
/**
class DrawingContext;
/**
@@
-98,10
+99,9
@@
public:
};
private:
};
private:
- unsigned int id;
-
+ const TileSet *tileset;
std::vector<ImageSpec> imagespecs;
std::vector<ImageSpec> imagespecs;
- std::vector<Surface*> images;
+ std::vector<Surface*>
images;
/// tile attributes
uint32_t attributes;
/// tile attributes
uint32_t attributes;
@@
-117,9
+117,6
@@
public:
/** Draw a tile on the screen */
void draw(DrawingContext& context, const Vector& pos, int z_pos) const;
/** Draw a tile on the screen */
void draw(DrawingContext& context, const Vector& pos, int z_pos) const;
- unsigned int getID() const
- { return id; }
-
uint32_t getAttributes() const
{ return attributes; }
uint32_t getAttributes() const
{ return attributes; }
@@
-143,14
+140,14
@@
public:
}
protected:
}
protected:
- friend class Tile
Manager
;
- Tile();
- Tile(
unsigned int id
, Uint32 attributes, const ImageSpec& imagespec);
+ friend class Tile
Set
;
+ Tile(
const TileSet *tileset
);
+ Tile(
const TileSet *tileset
, Uint32 attributes, const ImageSpec& imagespec);
- void load_images(
const std::string& tilesetpath
);
+ void load_images();
/// parses the tile and returns it's id number
/// parses the tile and returns it's id number
-
void
parse(const lisp::Lisp& reader);
+
uint32_t
parse(const lisp::Lisp& reader);
void parse_images(const lisp::Lisp& cur);
};
void parse_images(const lisp::Lisp& cur);
};