projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove draw_text from renderer.hpp and lightmap.hpp since text drawing is done in...
[supertux.git]
/
src
/
badguy
/
badguy.hpp
diff --git
a/src/badguy/badguy.hpp
b/src/badguy/badguy.hpp
index
5824610
..
6c18166
100644
(file)
--- a/
src/badguy/badguy.hpp
+++ b/
src/badguy/badguy.hpp
@@
-38,7
+38,7
@@
#include "audio/sound_manager.hpp"
#include "audio/sound_source.hpp"
#include "audio/sound_manager.hpp"
#include "audio/sound_source.hpp"
-class BadGuy : public MovingSprite, public Serializable
+class BadGuy : public MovingSprite, p
rotected UsesPhysic, p
ublic Serializable
{
public:
BadGuy(const Vector& pos, const std::string& sprite_name, int layer = LAYER_OBJECTS);
{
public:
BadGuy(const Vector& pos, const std::string& sprite_name, int layer = LAYER_OBJECTS);
@@
-66,11
+66,14
@@
public:
* screen (his sprite is turned upside-down)
*/
virtual void kill_fall();
* screen (his sprite is turned upside-down)
*/
virtual void kill_fall();
+
+ /** Call this, if you use custom kill_fall() or kill_squashed(GameObject& object) */
+ virtual void run_dead_script();
/** Writes out the badguy into the included lisp::Writer. Useful e.g. when
* converting an old-format level to the new format.
*/
/** Writes out the badguy into the included lisp::Writer. Useful e.g. when
* converting an old-format level to the new format.
*/
- virtual void
sav
e(lisp::Writer& writer);
+ virtual void
writ
e(lisp::Writer& writer);
/**
* True if this badguy can break bricks or open bonusblocks in his current form.
/**
* True if this badguy can break bricks or open bonusblocks in his current form.
@@
-107,7
+110,7
@@
public:
* Returns whether to call ignite() when a badguy gets hit by a fire bullet
*/
virtual bool is_flammable() const;
* Returns whether to call ignite() when a badguy gets hit by a fire bullet
*/
virtual bool is_flammable() const;
-
+
/**
* Returns whether this badguys is currently on fire
*/
/**
* Returns whether this badguys is currently on fire
*/
@@
-175,8
+178,6
@@
protected:
*/
Player* get_nearest_player();
*/
Player* get_nearest_player();
- Physic physic;
-
/// is the enemy activated
bool activated;
/**
/// is the enemy activated
bool activated;
/**
@@
-226,9
+227,8
@@
protected:
bool frozen;
bool ignited; /**< true if this badguy is currently on fire */
bool frozen;
bool ignited; /**< true if this badguy is currently on fire */
-
+
std::string dead_script; /**< script to execute when badguy is killed */
std::string dead_script; /**< script to execute when badguy is killed */
- bool draw_dead_script_hint; /**< whether to draw a visual indication that this Badguy triggers a script */
private:
void try_activate();
private:
void try_activate();