X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fyeti.h;h=cf36b5a8497ec0295b37e4c2628d430aa5227e7e;hb=16ed8c7ce29177a68fbf64d4cfc03739ae75c094;hp=3910097aa6d8ec0dbd606707c1af12960104f021;hpb=1d613f782e21f55f915b6e5fa808e7435896461a;p=supertux.git

diff --git a/src/badguy/yeti.h b/src/badguy/yeti.h
index 3910097aa..cf36b5a84 100644
--- a/src/badguy/yeti.h
+++ b/src/badguy/yeti.h
@@ -12,12 +12,16 @@ public:
   void write(lisp::Writer& writer);
   void active_action(float elapsed_time);
   HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  HitResponse collision_player(Player& player, const CollisionHit& hit);
+  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit&);
   bool collision_squished(Player& player);
+  void kill_fall();
 
 private:
   void go_right();
   void go_left();
   void angry_jumping();
+  void stun();
   void drop_stalactite();
   
   enum YetiState {
@@ -25,7 +29,8 @@ private:
     ANGRY_JUMPING,
     THROW_SNOWBALL,
     GO_RIGHT,
-    GO_LEFT
+    GO_LEFT,
+    STUNNED
   };
   enum Side {
     LEFT,
@@ -33,9 +38,12 @@ private:
   };
   Side side;
   YetiState state;
-  Timer2 timer;
+  Timer2 jump_timer;
+  Timer2 stun_timer;
   int jumpcount;
+  float jump_time_left;
   Mix_Chunk* sound_gna;
+  Mix_Chunk* sound_roar;
 };
 
 #endif