projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- added small/firetux to worldmap
[supertux.git]
/
src
/
worldmap.h
diff --git
a/src/worldmap.h
b/src/worldmap.h
index
75abd83
..
c2a7154
100644
(file)
--- a/
src/worldmap.h
+++ b/
src/worldmap.h
@@
-23,7
+23,7
@@
#include <vector>
#include <string>
#include <vector>
#include <string>
-#include
<SDL_mixer.h>
+#include
"musicref.h"
namespace WorldMapNS {
namespace WorldMapNS {
@@
-46,8
+46,12
@@
struct Point
int y;
};
int y;
};
-
struct
Tile
+
class
Tile
{
{
+public:
+ Tile();
+ ~Tile();
+
Surface* sprite;
// Directions in which Tux is allowed to walk from this tile
Surface* sprite;
// Directions in which Tux is allowed to walk from this tile
@@
-58,6
+62,10
@@
struct Tile
/** Stop on this tile or walk over it? */
bool stop;
/** Stop on this tile or walk over it? */
bool stop;
+
+ /** When set automatically turn directions when walked over such a
+ tile (ie. walk smoothly a curve) */
+ bool auto_walk;
};
class TileManager
};
class TileManager
@@
-65,25
+73,31
@@
class TileManager
private:
typedef std::vector<Tile*> Tiles;
Tiles tiles;
private:
typedef std::vector<Tile*> Tiles;
Tiles tiles;
- static TileManager* instance_ ;
- TileManager();
public:
public:
- static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); }
+ TileManager();
+ ~TileManager();
- void load();
Tile* get(int i);
};
enum Direction { NONE, WEST, EAST, NORTH, SOUTH };
Tile* get(int i);
};
enum Direction { NONE, WEST, EAST, NORTH, SOUTH };
+std::string direction_to_string(Direction d);
+Direction string_to_direction(const std::string& d);
+Direction reverse_dir(Direction d);
+
class WorldMap;
class Tux
{
class WorldMap;
class Tux
{
+public:
+ Direction back_direction;
private:
WorldMap* worldmap;
private:
WorldMap* worldmap;
- Surface* sprite;
+ Surface* largetux_sprite;
+ Surface* firetux_sprite;
+ Surface* smalltux_sprite;
Direction input_direction;
Direction direction;
Direction input_direction;
Direction direction;
@@
-96,6
+110,7
@@
private:
void stop();
public:
Tux(WorldMap* worldmap_);
void stop();
public:
Tux(WorldMap* worldmap_);
+ ~Tux();
void draw(const Point& offset);
void update(float delta);
void draw(const Point& offset);
void update(float delta);
@@
-127,18
+142,29
@@
private:
int width;
int height;
int width;
int height;
+ TileManager* tile_manager;
+
+public:
struct Level
{
int x;
int y;
std::string name;
struct Level
{
int x;
int y;
std::string name;
+ std::string title;
bool solved;
bool solved;
+
+ // Directions which are walkable from this level
+ bool north;
+ bool east;
+ bool south;
+ bool west;
};
};
+private:
typedef std::vector<Level> Levels;
Levels levels;
typedef std::vector<Level> Levels;
Levels levels;
- M
ix_Music*
song;
+ M
usicRef
song;
Direction input_direction;
bool enter_level;
Direction input_direction;
bool enter_level;
@@
-146,6
+172,8
@@
private:
Point offset;
std::string savegame_file;
Point offset;
std::string savegame_file;
+ void get_level_title(Levels::pointer level);
+
void draw_status();
public:
WorldMap();
void draw_status();
public:
WorldMap();
@@
-166,6
+194,7
@@
public:
Point get_next_tile(Point pos, Direction direction);
Tile* at(Point pos);
Point get_next_tile(Point pos, Direction direction);
Tile* at(Point pos);
+ WorldMap::Level* at_level();
/** Check if it is possible to walk from \a pos into \a direction,
if possible, write the new position to \a new_pos */
/** Check if it is possible to walk from \a pos into \a direction,
if possible, write the new position to \a new_pos */
@@
-173,6
+202,8
@@
public:
void savegame(const std::string& filename);
void loadgame(const std::string& filename);
void savegame(const std::string& filename);
void loadgame(const std::string& filename);
+private:
+ void on_escape_press();
};
} // namespace WorldMapNS
};
} // namespace WorldMapNS