X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fcandle.hpp;h=95d005a400a78a74f1eec5c9d34616da644dfb52;hb=ab9eab4c870195c2b60ce76b77044c35b31e8806;hp=38ea325892ab730792cfb6597f628294155c4e78;hpb=24e5b19904a9b115a92e933bd62748ff5c198613;p=supertux.git diff --git a/src/object/candle.hpp b/src/object/candle.hpp index 38ea32589..95d005a40 100644 --- 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 "video/surface.hpp" /** * 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); } - + virtual void draw(DrawingContext& context); + 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 */ - 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 -