fixed a bug in my last effects removal, improved the algo to determine if a badguy...

[supertux.git] / src / badguy / yeti.h

diff --git a/src/badguy/yeti.h b/src/badguy/yeti.h
index 06afed8..4716ddc 100644 (file)
--- a/src/badguy/yeti.h
+++ b/src/badguy/yeti.h
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #ifndef __YETI_H__
 #define __YETI_H__
 
@@ -29,10 +28,10 @@ public:
   Yeti(const lisp::Lisp& lisp);
   ~Yeti();
 
+  void draw(DrawingContext& context);
   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_solid(GameObject& object, const CollisionHit& hit);
   bool collision_squished(Player& player);
   void kill_fall();
 
@@ -52,10 +51,10 @@ private:
   };
   Direction side;
   YetiState state;
-  Timer2 timer;
+  Timer timer;
+  Timer safe_timer;
   int jumpcount;
-  Mix_Chunk* sound_gna;
-  Mix_Chunk* sound_roar;
+  int hit_points;
 };
 
 #endif