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

diff --git a/src/badguy/yeti.h b/src/badguy/yeti.h
index 3910097aa..4716ddcab 100644
--- a/src/badguy/yeti.h
+++ b/src/badguy/yeti.h
@@ -1,3 +1,22 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  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__
 
@@ -9,16 +28,19 @@ 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_solid(GameObject& object, const CollisionHit& hit);
   bool collision_squished(Player& player);
+  void kill_fall();
 
 private:
   void go_right();
   void go_left();
   void angry_jumping();
   void drop_stalactite();
+  void summon_snowball();
   
   enum YetiState {
     INIT,
@@ -27,15 +49,12 @@ private:
     GO_RIGHT,
     GO_LEFT
   };
-  enum Side {
-    LEFT,
-    RIGHT
-  };
-  Side side;
+  Direction side;
   YetiState state;
-  Timer2 timer;
+  Timer timer;
+  Timer safe_timer;
   int jumpcount;
-  Mix_Chunk* sound_gna;
+  int hit_points;
 };
 
 #endif