projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated svn:externals
[supertux.git]
/
src
/
worldmap
/
teleporter.hpp
diff --git
a/src/worldmap/teleporter.hpp
b/src/worldmap/teleporter.hpp
index
243b36a
..
0e5cff3
100644
(file)
--- a/
src/worldmap/teleporter.hpp
+++ b/
src/worldmap/teleporter.hpp
@@
-40,7
+40,7
@@
public:
/** Position (in tiles, not pixels) */
Vector pos;
/** Position (in tiles, not pixels) */
Vector pos;
-
+
/** Sprite to render, or 0 for no sprite */
std::auto_ptr<Sprite> sprite;
/** Sprite to render, or 0 for no sprite */
std::auto_ptr<Sprite> sprite;
@@
-50,12
+50,14
@@
public:
/** Spawnpoint to teleport to. Leave empty to use "main" or last one */
std::string spawnpoint;
/** Spawnpoint to teleport to. Leave empty to use "main" or last one */
std::string spawnpoint;
- /** true if this teleporter needs to be activated */
- bool interactive;
+ /** true if this teleporter does not need to be activated, but teleports Tux as soon as it's touched */
+ bool automatic;
+
+ /** optional map message to display */
+ std::string message;
};
}
#endif
};
}
#endif
-