projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nolok can be killed with fireballs now
[supertux.git]
/
src
/
worldmap.h
diff --git
a/src/worldmap.h
b/src/worldmap.h
index
80585ea
..
55eddfc
100644
(file)
--- a/
src/worldmap.h
+++ b/
src/worldmap.h
@@
-32,6
+32,7
@@
namespace SuperTux {
class Menu;
namespace SuperTux {
class Menu;
+ class Sprite;
}
extern Menu* worldmap_menu;
}
extern Menu* worldmap_menu;
@@
-66,9
+67,7
@@
public:
Direction back_direction;
private:
WorldMap* worldmap;
Direction back_direction;
private:
WorldMap* worldmap;
- Surface* largetux_sprite;
- Surface* firetux_sprite;
- Surface* smalltux_sprite;
+ Sprite* tux_sprite;
Direction input_direction;
Direction direction;
Direction input_direction;
Direction direction;
@@
-83,7
+82,7
@@
public:
Tux(WorldMap* worldmap_);
~Tux();
Tux(WorldMap* worldmap_);
~Tux();
- void draw(DrawingContext& context
, const Vector& offset
);
+ void draw(DrawingContext& context);
void action(float elapsed_time);
void set_direction(Direction dir);
void action(float elapsed_time);
void set_direction(Direction dir);
@@
-185,6
+184,7
@@
public:
private:
std::string map_filename;
private:
std::string map_filename;
+ std::string levels_path;
typedef std::vector<SpecialTile> SpecialTiles;
SpecialTiles special_tiles;
typedef std::vector<SpecialTile> SpecialTiles;
SpecialTiles special_tiles;
@@
-198,6
+198,9
@@
private:
Vector offset;
std::string savegame_file;
Vector offset;
std::string savegame_file;
+
+ std::string intro_filename;
+ bool intro_displayed;
void get_level_title(Level& level);
void get_level_title(Level& level);
@@
-223,7
+226,7
@@
public:
void update(float delta);
/** Draw one frame */
void update(float delta);
/** Draw one frame */
- void draw(DrawingContext& context
, const Vector& offset
);
+ void draw(DrawingContext& context);
Vector get_next_tile(Vector pos, Direction direction);
const Tile* at(Vector pos);
Vector get_next_tile(Vector pos, Direction direction);
const Tile* at(Vector pos);