projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Magic Blocks. (DrawingContext::get_light is not working yet.)
[supertux.git]
/
src
/
object
/
candle.hpp
diff --git
a/src/object/candle.hpp
b/src/object/candle.hpp
index
38ea325
..
95d005a
100644
(file)
--- a/
src/object/candle.hpp
+++ b/
src/object/candle.hpp
@@
-25,6
+25,7
@@
#include "lisp/lisp.hpp"
#include "object/moving_sprite.hpp"
#include "script_interface.hpp"
#include "lisp/lisp.hpp"
#include "object/moving_sprite.hpp"
#include "script_interface.hpp"
+#include "video/surface.hpp"
/**
* A burning candle: Simple, scriptable level decoration.
/**
* A burning candle: Simple, scriptable level decoration.
@@
-34,7
+35,8
@@
class Candle : public MovingSprite, public ScriptInterface
public:
Candle(const lisp::Lisp& lisp);
virtual Candle* clone() const { return new Candle(*this); }
public:
Candle(const lisp::Lisp& lisp);
virtual Candle* clone() const { return new Candle(*this); }
-
+ virtual void draw(DrawingContext& context);
+
HitResponse collision(GameObject& other, const CollisionHit& hit);
virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
HitResponse collision(GameObject& other, const CollisionHit& hit);
virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
@@
-47,9
+49,9
@@
public:
private:
bool burning; /**< true if candle is currently lighted */
private:
bool burning; /**< true if candle is currently lighted */
- std::string name; /**< user-defined name for use in scripts or empty string if not scriptable */
+ Surface candle_light_1; /**< drawn to lightmap */
+ Surface candle_light_2; /**< drawn to lightmap (alternative image) */
};
#endif
};
#endif
-