projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix cr/lfs and remove trailing whitespaces...
[supertux.git]
/
src
/
worldmap
/
tux.hpp
diff --git
a/src/worldmap/tux.hpp
b/src/worldmap/tux.hpp
index
6519785
..
67ec76d
100644
(file)
--- a/
src/worldmap/tux.hpp
+++ b/
src/worldmap/tux.hpp
@@
-55,10
+55,10
@@
private:
void tryStartWalking(); /**< try starting to walk in input_direction */
void tryContinueWalking(float elapsed_time); /**< try to continue walking in current direction */
void tryStartWalking(); /**< try starting to walk in input_direction */
void tryContinueWalking(float elapsed_time); /**< try to continue walking in current direction */
-public:
+public:
Tux(WorldMap* worldmap_);
~Tux();
Tux(WorldMap* worldmap_);
~Tux();
-
+
void setup(); /**< called prior to first update */
void draw(DrawingContext& context);
void update(float elapsed_time);
void setup(); /**< called prior to first update */
void draw(DrawingContext& context);
void update(float elapsed_time);
@@
-67,11
+67,10
@@
public:
bool is_moving() const { return moving; }
Vector get_pos();
bool is_moving() const { return moving; }
Vector get_pos();
- Vector get_tile_pos() const { return tile_pos; }
- void set_tile_pos(Vector p) { tile_pos = p; }
+ Vector get_tile_pos() const { return tile_pos; }
+ void set_tile_pos(Vector p) { tile_pos = p; }
};
}
#endif
};
}
#endif
-