projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added type checking for __custom functions
[supertux.git]
/
src
/
tile.hpp
diff --git
a/src/tile.hpp
b/src/tile.hpp
index
d1c7fe7
..
2f57f3d
100644
(file)
--- a/
src/tile.hpp
+++ b/
src/tile.hpp
@@
-77,7
+77,7
@@
public:
WORLDMAP_SOUTH = 0x0002,
WORLDMAP_EAST = 0x0004,
WORLDMAP_WEST = 0x0008,
WORLDMAP_SOUTH = 0x0002,
WORLDMAP_EAST = 0x0004,
WORLDMAP_WEST = 0x0008,
-
WORLDMAP_DIR_MASK = 0x000f,
+ WORLDMAP_DIR_MASK = 0x000f,
WORLDMAP_STOP = 0x0010,
WORLDMAP_STOP = 0x0010,
@@
-142,13
+142,18
@@
public:
protected:
friend class TileSet;
Tile(const TileSet *tileset);
protected:
friend class TileSet;
Tile(const TileSet *tileset);
- Tile(const TileSet *tileset, Uint32 attributes, const ImageSpec& imagespec);
+ Tile(const TileSet *tileset, std::vector<std::string> images, Rect rect,
+ Uint32 attributes = 0, Uint32 data = 0, float animfps = 1.0);
void load_images();
/// parses the tile and returns it's id number
uint32_t parse(const lisp::Lisp& reader);
void parse_images(const lisp::Lisp& cur);
void load_images();
/// parses the tile and returns it's id number
uint32_t parse(const lisp::Lisp& reader);
void parse_images(const lisp::Lisp& cur);
+
+ //Correct small oddities in attributes that naive people
+ //might miss (and rebuke them for it)
+ void correct_attributes();
};
#endif
};
#endif