projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*Removed stuff from times of automake and CVS (directories, .cvsignores).
[supertux.git]
/
src
/
worldmap.h
diff --git
a/src/worldmap.h
b/src/worldmap.h
index
8c19d74
..
dd5d03a
100644
(file)
--- a/
src/worldmap.h
+++ b/
src/worldmap.h
@@
-82,7
+82,7
@@
public:
~Tux();
void draw(DrawingContext& context);
~Tux();
void draw(DrawingContext& context);
- void
action
(float elapsed_time);
+ void
update
(float elapsed_time);
void set_direction(Direction dir);
void set_direction(Direction dir);
@@
-257,7
+257,8
@@
public:
private:
void on_escape_press();
private:
void on_escape_press();
- void parse_special_tiles(const lisp::Lisp* lisp);
+ void parse_special_tile(const lisp::Lisp* lisp);
+ void parse_level_tile(const lisp::Lisp* lisp);
};
} // namespace WorldMapNS
};
} // namespace WorldMapNS