projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- beginnings of a wingling
[supertux.git]
/
src
/
tile.h
diff --git
a/src/tile.h
b/src/tile.h
index
ee6a0f6
..
a94a19c
100644
(file)
--- a/
src/tile.h
+++ b/
src/tile.h
@@
-21,12
+21,14
@@
#ifndef TILE_H
#define TILE_H
#ifndef TILE_H
#define TILE_H
+#include <set>
#include <map>
#include <vector>
#include "texture.h"
#include "globals.h"
#include "lispreader.h"
#include "setup.h"
#include <map>
#include <vector>
#include "texture.h"
#include "globals.h"
#include "lispreader.h"
#include "setup.h"
+#include "vector.h"
/**
Tile Class
/**
Tile Class
@@
-43,7
+45,8
@@
public:
std::vector<Surface*> editor_images;
std::vector<std::string> filenames;
std::vector<Surface*> editor_images;
std::vector<std::string> filenames;
-
+ std::vector<std::string> editor_filenames;
+
/** solid tile that is indestructable by Tux */
bool solid;
/** solid tile that is indestructable by Tux */
bool solid;
@@
-56,12
+59,16
@@
public:
/** water */
bool water;
/** water */
bool water;
+ /** spike - kills player on contact */
+ bool spike;
+
/** Bonusbox, content is stored in \a data */
bool fullbox;
/** Tile is a distro/coin */
bool distro;
/** Bonusbox, content is stored in \a data */
bool fullbox;
/** Tile is a distro/coin */
bool distro;
+
/** 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.
/** 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.
@@
-79,10
+86,21
@@
public:
/** Draw a tile on the screen: */
static void draw(float x, float y, unsigned int c, Uint8 alpha = 255);
/** Draw a tile on the screen: */
static void draw(float x, float y, unsigned int c, Uint8 alpha = 255);
+ static void draw_stretched(float x, float y, int w, int h, unsigned int c, Uint8 alpha = 255);
+
+ static void draw(const Vector& pos, unsigned int c, Uint8 alpha = 255)
+ {
+ draw(pos.x, pos.y, c, alpha);
+ }
};
struct TileGroup
{
};
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;
};
std::string name;
std::vector<int> tiles;
};
@@
-95,7
+113,7
@@
class TileManager
std::vector<Tile*> tiles;
static TileManager* instance_ ;
std::vector<Tile*> tiles;
static TileManager* instance_ ;
- static std::
vector
<TileGroup>* tilegroups_;
+ static std::
set
<TileGroup>* tilegroups_;
void load_tileset(std::string filename);
std::string current_tileset;
void load_tileset(std::string filename);
std::string current_tileset;
@@
-104,7
+122,7
@@
class TileManager
static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); }
static void destroy_instance() { delete instance_; instance_ = 0; }
static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); }
static void destroy_instance() { delete instance_; instance_ = 0; }
- static std::
vector<TileGroup>* tilegroups() { return tilegroups_ ? tilegroups_ : tilegroups_ = new std::vector
<TileGroup>; }
+ 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())
{
Tile* get(unsigned int id) {
if(id < tiles.size())
{