X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fyeti.h;h=1f14a6b98cc479e2a6975877300222cffe1c230e;hb=523d415707de9f777729534f467779d4c5acdf6e;hp=5e42965c45bf1c2a671085c5718c290716a6889c;hpb=e8a1d89d3d0f4824d3d906ca67149afec0a75e4b;p=supertux.git

diff --git a/src/badguy/yeti.h b/src/badguy/yeti.h
index 5e42965c4..1f14a6b98 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,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);
+  void active_update(float elapsed_time);
+  HitResponse collision_solid(GameObject& object, const CollisionHit& hit);
   bool collision_squished(Player& player);
   void kill_fall();
 
@@ -32,10 +51,11 @@ 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;
+  std::string dead_script;
 };
 
 #endif