projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve exception feedback a bit
[supertux.git]
/
src
/
tilemap.h
diff --git
a/src/tilemap.h
b/src/tilemap.h
index
18340aa
..
92d121d
100644
(file)
--- a/
src/tilemap.h
+++ b/
src/tilemap.h
@@
-22,15
+22,29
@@
#include <vector>
#include <vector>
-#include "game_object.h"
+#include "
special/
game_object.h"
#include "serializable.h"
#include "serializable.h"
-#include "vector.h"
+#include "math/vector.h"
+
+using namespace SuperTux;
+
+namespace SuperTux {
+class LispReader;
+}
class Level;
class TileManager;
class Level;
class TileManager;
-class LispReader;
class Tile;
class Tile;
+struct TileId
+{
+ TileId() : id(0), hidden(0) {}
+ explicit TileId(unsigned int i, bool hidden_ = false) : id(i), hidden(hidden_) {}
+
+ unsigned id :31;
+ unsigned hidden :1;
+};
+
/**
* This class is reponsible for drawing the level tiles
*/
/**
* This class is reponsible for drawing the level tiles
*/
@@
-39,6
+53,7
@@
class TileMap : public GameObject, public Serializable
public:
TileMap();
TileMap(LispReader& reader);
public:
TileMap();
TileMap(LispReader& reader);
+ TileMap(int layer_, bool solid_, size_t width_, size_t height_);
virtual ~TileMap();
virtual void write(LispWriter& writer);
virtual ~TileMap();
virtual void write(LispWriter& writer);
@@
-54,16
+69,23
@@
public:
*/
void resize(int newwidth, int newheight);
*/
void resize(int newwidth, int newheight);
+ /** Flip the all tile map vertically. The purpose of this is to let
+ player to play the same level in a different way :) */
+ void do_vertical_flip();
+
size_t get_width() const
{ return width; }
size_t get_height() const
{ return height; }
size_t get_width() const
{ return width; }
size_t get_height() const
{ return height; }
+
+ int get_layer() const
+ { return layer; }
bool is_solid() const
{ return solid; }
bool is_solid() const
{ return solid; }
-
unsigned int get_tile_id_at(const Vector& pos) const
;
+
TileId& get_tile_id_at(const Vector& pos)
;
/// returns tile in row y and column y (of the tilemap)
Tile* get_tile(int x, int y) const;
/// returns tile in row y and column y (of the tilemap)
Tile* get_tile(int x, int y) const;
@@
-74,8
+96,8
@@
public:
void change_at(const Vector& pos, unsigned int newtile);
void change_at(const Vector& pos, unsigned int newtile);
-p
ublic
:
- std::vector<
unsigned int
> tiles;
+p
rivate
:
+ std::vector<
TileId
> tiles;
private:
TileManager* tilemanager;
private:
TileManager* tilemanager;
@@
-83,6
+105,8
@@
private:
float speed;
int width, height;
int layer;
float speed;
int width, height;
int layer;
+
+ bool vertical_flip;
};
#endif /*SUPERTUX_TILEMAP_H*/
};
#endif /*SUPERTUX_TILEMAP_H*/