Getting rid of nasty tabs

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

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index 2085551..2eca07e 100644 (file)
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -53,7 +53,7 @@ namespace {
 }
 
 Yeti::Yeti(const lisp::Lisp& reader)
-       : BadGuy(reader, "images/creatures/yeti/yeti.sprite")
+  : BadGuy(reader, "images/creatures/yeti/yeti.sprite")
 {
   hit_points = INITIAL_HITPOINTS;
   countMe = false;
@@ -67,7 +67,7 @@ Yeti::~Yeti()
 }
 
 void
-Yeti::activate()
+Yeti::initialize()
 {
   dir = RIGHT;
   jump_down();
@@ -219,7 +219,7 @@ void Yeti::take_hit(Player& )
 
     state = SQUISHED;
     state_timer.start(SQUISH_TIME);
-    set_group(COLGROUP_MOVING_ONLY_STATIC);
+    set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC);
     sprite->set_action("dead");
 
     if (countMe) Sector::current()->get_level()->stats.badguys++;
@@ -290,28 +290,28 @@ Yeti::collision_solid(const CollisionHit& hit)
     physic.set_velocity_y(0);
     switch (state) {
       case JUMP_DOWN:
-       run();
-       break;
+        run();
+        break;
       case RUN:
-       break;
+        break;
       case JUMP_UP:
-       break;
+        break;
       case BE_ANGRY:
-       // we just landed
-       if(!state_timer.started()) {
-         sprite->set_action((dir==RIGHT)?"stand-right":"stand-left");
-         stomp_count++;
-         drop_stalactite();
-
-         // go to other side after 3 jumps
-         if(stomp_count == 3) {
-           jump_down();
-         } else {
-           // jump again
-           state_timer.start(STOMP_WAIT);
-         }
-       }
-       break;
+        // we just landed
+        if(!state_timer.started()) {
+          sprite->set_action((dir==RIGHT)?"stand-right":"stand-left");
+          stomp_count++;
+          drop_stalactite();
+
+          // go to other side after 3 jumps
+          if(stomp_count == 3) {
+            jump_down();
+          } else {
+            // jump again
+            state_timer.start(STOMP_WAIT);
+          }
+        }
+        break;
       case SQUISHED:
         break;
     }