projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this file doesn't belong into svn
[supertux.git]
/
src
/
worldmap.h
diff --git
a/src/worldmap.h
b/src/worldmap.h
index
0403e2f
..
8c19d74
100644
(file)
--- a/
src/worldmap.h
+++ b/
src/worldmap.h
@@
-26,14
+26,13
@@
#include "audio/musicref.h"
#include "video/screen.h"
#include "lisp/lisp.h"
#include "audio/musicref.h"
#include "video/screen.h"
#include "lisp/lisp.h"
+#include "control/controller.h"
#include "statistics.h"
#include "timer.h"
#include "tile_manager.h"
#include "statistics.h"
#include "timer.h"
#include "tile_manager.h"
-namespace SuperTux {
- class Menu;
-}
-
+class Sprite;
+class Menu;
extern Menu* worldmap_menu;
namespace WorldMapNS {
extern Menu* worldmap_menu;
namespace WorldMapNS {
@@
-66,9
+65,8
@@
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;
+ Controller* controller;
Direction input_direction;
Direction direction;
Direction input_direction;
Direction direction;
@@
-83,7
+81,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);
@@
-180,7
+178,7
@@
public:
};
/** Variables to deal with the passive map messages */
};
/** Variables to deal with the passive map messages */
- Timer
2
passive_message_timer;
+ Timer passive_message_timer;
std::string passive_message;
private:
std::string passive_message;
private:
@@
-195,10
+193,11
@@
private:
MusicRef song;
MusicRef song;
- bool enter_level;
-
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);
@@
-224,7
+223,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);