projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed jump behaviour: Tux will now jump even if the button was pressed (up to)...
[supertux.git]
/
src
/
object
/
lantern.hpp
diff --git
a/src/object/lantern.hpp
b/src/object/lantern.hpp
index
f991105
..
b8498a3
100644
(file)
--- a/
src/object/lantern.hpp
+++ b/
src/object/lantern.hpp
@@
-29,6
+29,7
@@
class Lantern : public Rock
{
public:
class Lantern : public Rock
{
public:
+ Lantern(const Vector& pos);
Lantern(const lisp::Lisp& reader);
void draw(DrawingContext& context);
~Lantern();
Lantern(const lisp::Lisp& reader);
void draw(DrawingContext& context);
~Lantern();
@@
-38,6
+39,18
@@
public:
void grab(MovingObject& object, const Vector& pos, Direction dir);
void ungrab(MovingObject& object, Direction dir);
void grab(MovingObject& object, const Vector& pos, Direction dir);
void ungrab(MovingObject& object, Direction dir);
+ /**
+ * returns true if lamp is currently open
+ */
+ bool is_open();
+
+ /**
+ * returns the lamp's color
+ */
+ Color get_color() const {
+ return lightcolor;
+ }
+
private:
Color lightcolor;
Sprite* lightsprite;
private:
Color lightcolor;
Sprite* lightsprite;