X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fyeti.h;h=06afed80e379c0509018d596401b3d44df7b74a5;hb=845dceca7faef5eec20976fbc482f7a7cda2b96b;hp=cf36b5a8497ec0295b37e4c2628d430aa5227e7e;hpb=ec937b952cb7ba5e9ef9f7576a64244951ccf1c7;p=supertux.git

diff --git a/src/badguy/yeti.h b/src/badguy/yeti.h
index cf36b5a84..06afed80e 100644
--- a/src/badguy/yeti.h
+++ b/src/badguy/yeti.h
@@ -1,3 +1,23 @@
+//  $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__
 
@@ -13,7 +33,6 @@ public:
   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();
 
@@ -21,27 +40,20 @@ private:
   void go_right();
   void go_left();
   void angry_jumping();
-  void stun();
   void drop_stalactite();
+  void summon_snowball();
   
   enum YetiState {
     INIT,
     ANGRY_JUMPING,
     THROW_SNOWBALL,
     GO_RIGHT,
-    GO_LEFT,
-    STUNNED
-  };
-  enum Side {
-    LEFT,
-    RIGHT
+    GO_LEFT
   };
-  Side side;
+  Direction side;
   YetiState state;
-  Timer2 jump_timer;
-  Timer2 stun_timer;
+  Timer2 timer;
   int jumpcount;
-  float jump_time_left;
   Mix_Chunk* sound_gna;
   Mix_Chunk* sound_roar;
 };