projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nolok dies properly now :)
[supertux.git]
/
src
/
sector.h
diff --git
a/src/sector.h
b/src/sector.h
index
05bdf41
..
598842b
100644
(file)
--- a/
src/sector.h
+++ b/
src/sector.h
@@
-124,7
+124,7
@@
private:
void collision_object(MovingObject* object1, MovingObject* object2);
void load_music();
void collision_object(MovingObject* object1, MovingObject* object2);
void load_music();
- GameObject* parse
O
bject(const std::string& name, LispReader& reader);
+ GameObject* parse
_o
bject(const std::string& name, LispReader& reader);
static Sector* _current;
static Sector* _current;
@@
-153,6
+153,8
@@
public: // TODO make this private again
GameObjects gameobjects;
private:
GameObjects gameobjects;
private:
+ void fix_old_tiles();
+
/// container for newly created objects, they'll be added in Sector::action
GameObjects gameobjects_new;
/// container for newly created objects, they'll be added in Sector::action
GameObjects gameobjects_new;