projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed broken 1-time animations in sprites, fixed collision code returning no-collisio...
[supertux.git]
/
src
/
tilemap.h
diff --git
a/src/tilemap.h
b/src/tilemap.h
index
50a843e
..
8aa2b48
100644
(file)
--- a/
src/tilemap.h
+++ b/
src/tilemap.h
@@
-21,25
+21,22
@@
#define SUPERTUX_TILEMAP_H
#include <vector>
#define SUPERTUX_TILEMAP_H
#include <vector>
+#include <stdint.h>
#include "special/game_object.h"
#include "serializable.h"
#include "math/vector.h"
#include "special/game_object.h"
#include "serializable.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
*/
@@
-80,19
+77,17
@@
public:
bool is_solid() const
{ return solid; }
bool is_solid() const
{ return solid; }
- TileId& get_tile_id_at(const Vector& pos);
-
/// returns tile in row y and column y (of the tilemap)
/// returns tile in row y and column y (of the tilemap)
- Tile* get_tile(int x, int y) const;
+
const
Tile* get_tile(int x, int y) const;
/// returns tile at position pos (in world coordinates)
/// returns tile at position pos (in world coordinates)
- Tile* get_tile_at(const Vector& pos) const;
+
const
Tile* get_tile_at(const Vector& pos) const;
- void change(int x, int y, u
nsigned in
t newtile);
+ void change(int x, int y, u
int32_
t newtile);
- void change_at(const Vector& pos, u
nsigned in
t newtile);
+ void change_at(const Vector& pos, u
int32_
t newtile);
private:
private:
- std::vector<
TileId
> tiles;
+ std::vector<
uint32_t
> tiles;
private:
TileManager* tilemanager;
private:
TileManager* tilemanager;