projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolled back bomb to old behaviour, some bomb gfx tuning
[supertux.git]
/
src
/
badguy
/
yeti.hpp
diff --git
a/src/badguy/yeti.hpp
b/src/badguy/yeti.hpp
index
d7e16ce
..
a3c996f
100644
(file)
--- a/
src/badguy/yeti.hpp
+++ b/
src/badguy/yeti.hpp
@@
-21,6
+21,8
@@
#ifndef __YETI_H__
#define __YETI_H__
#ifndef __YETI_H__
#define __YETI_H__
+#include <memory>
+
#include "badguy.hpp"
class Yeti : public BadGuy
#include "badguy.hpp"
class Yeti : public BadGuy
@@
-31,14
+33,14
@@
public:
void draw(DrawingContext& context);
void write(lisp::Writer& writer);
void draw(DrawingContext& context);
void write(lisp::Writer& writer);
- void
activat
e();
+ void
initializ
e();
void active_update(float elapsed_time);
void collision_solid(const CollisionHit& hit);
void active_update(float elapsed_time);
void collision_solid(const CollisionHit& hit);
- bool collision_squished(
Player& player
);
- void kill_squished(
Player& player
);
+ bool collision_squished(
GameObject& object
);
+ void kill_squished(
GameObject& object
);
void kill_fall();
void kill_fall();
- virtual Yeti* clone() const { return new Yeti(*this); }
+ virtual Yeti* clone() const { return new Yeti(
(Yeti&)
*this); }
private:
void run();
private:
void run();
@@
-48,6
+50,8
@@
private:
void summon_snowball();
void jump_down();
void summon_snowball();
void jump_down();
+ void draw_hit_points(DrawingContext& context);
+
void take_hit(Player& player);
enum YetiState {
void take_hit(Player& player);
enum YetiState {
@@
-62,7
+66,7
@@
private:
Timer safe_timer;
int stomp_count;
int hit_points;
Timer safe_timer;
int stomp_count;
int hit_points;
- std::
string dead_script
;
+ std::
auto_ptr<Surface> hud_head
;
};
#endif
};
#endif