- fix a bunch of msvc warnings (mostly assigning double constants to float variables)

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

diff --git a/src/badguy/yeti.hpp b/src/badguy/yeti.hpp
index 30a6744..f1b7504 100644 (file)
--- a/src/badguy/yeti.hpp
+++ b/src/badguy/yeti.hpp
@@ -33,9 +33,9 @@ public:
   void write(lisp::Writer& writer);
   void activate();
   void active_update(float elapsed_time);
-  HitResponse collision_solid(GameObject& object, const CollisionHit& hit);
-  bool collision_squished(Player& player);
-  void kill_squished(Player& player);
+  void collision_solid(const CollisionHit& hit);
+  bool collision_squished(GameObject& object);
+  void kill_squished(GameObject& object);
   void kill_fall();
 
   virtual Yeti* clone() const { return new Yeti(*this); }
@@ -49,7 +49,7 @@ private:
   void jump_down();
 
   void take_hit(Player& player);
-  
+
   enum YetiState {
     JUMP_DOWN,
     RUN,
@@ -62,8 +62,6 @@ private:
   Timer safe_timer;
   int stomp_count;
   int hit_points;
-  std::string dead_script;
 };
 
 #endif
-