Updated code to support new stuff from 0.1.2.

[supertux.git] / src / badguy.cpp

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 807a8d8..5b762bb 100644 (file)
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -24,7 +24,7 @@
 #include <cmath>
 
 #include "app/globals.h"
-#include "app/defines.h"
+#include "defines.h"
 #include "special/sprite_manager.h"
 #include "utils/lispwriter.h"
 #include "badguy.h"
@@ -357,7 +357,7 @@ BadGuy::action_mriceblock(double elapsed_time)
           tux.kick_timer.start(KICKING_TIME);
           set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
           physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5);
-          sound_manager->play_sound(sounds[SND_KICK], this, Sector::current()->player->get_pos());
+          SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos());
         }
     }
 
@@ -367,7 +367,7 @@ BadGuy::action_mriceblock(double elapsed_time)
       check_horizontal_bump();
       if(mode == KICK && changed != dir)
         {
-          sound_manager->play_sound(sounds[SND_RICOCHET], get_pos(), Sector::current()->player->get_pos());
+          SoundManager::get()->play_sound(IDToSound(SND_RICOCHET), get_pos(), Sector::current()->player->get_pos());
         }
     }
 
@@ -561,7 +561,7 @@ BadGuy::action_bomb(double elapsed_time)
       dying = DYING_NOT; // now the bomb hurts
       timer.start(EXPLODETIME);
 
-      sound_manager->play_sound(sounds[SND_EXPLODE], this, Sector::current()->player->get_pos());
+      SoundManager::get()->play_sound(IDToSound(SND_EXPLODE), this, Sector::current()->player->get_pos());
     } else if(mode == BOMB_EXPLODE) {
       remove_me();
       return;
@@ -818,29 +818,11 @@ BadGuy::action_wingling(double elapsed_time)
 void
 BadGuy::action_walkingtree(double elapsed_time)
 {
-  Player& tux = *Sector::current()->player;
-  Direction v_dir = physic.get_velocity_x() < 0 ? LEFT : RIGHT;
-
   if (dying == DYING_NOT)
     check_horizontal_bump();
 
   fall();
 
-  if (mode == BGM_BIG && tux.dying == DYING_NOT)
-  {
-    if ((tux.base.x + tux.base.width/2 > base.x + base.width/2) && v_dir == LEFT)
-    {
-      dir = RIGHT;
-      physic.set_velocity_x(-physic.get_velocity_x());
-    }
-    else if ((tux.base.x + tux.base.width/2 < base.x + base.width/2) && v_dir == RIGHT)
-    {
-      dir = LEFT;
-      physic.set_velocity_x(-physic.get_velocity_x());
-    }
-  }
-  
-
   physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if (dying != DYING_FALLING)
     collision_swept_object_map(&old_base,&base);
@@ -1034,7 +1016,7 @@ BadGuy::squish_me(Player* player)
   Sector::current()->add_score(Vector(base.x, base.y),
                               50 * player_status.score_multiplier);
 
-  sound_manager->play_sound(sounds[SND_SQUISH], get_pos(), Sector::current()->player->get_pos());
+  SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos());
   player_status.score_multiplier++;
 
   dying = DYING_SQUISHED;
@@ -1054,7 +1036,7 @@ BadGuy::squish(Player* player)
     player->bounce(this);
     Sector::current()->add_score(Vector(base.x, base.y),
                                 50 * player_status.score_multiplier);
-    sound_manager->play_sound(sounds[SND_SQUISH], get_pos(), Sector::current()->player->get_pos());
+    SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos());
     player_status.score_multiplier++;
     return;
 
@@ -1062,7 +1044,7 @@ BadGuy::squish(Player* player)
     if (mode == NORMAL || mode == KICK)
       {
         /* Flatten! */
-        sound_manager->play_sound(sounds[SND_STOMP], get_pos(), Sector::current()->player->get_pos());
+        SoundManager::get()->play_sound(IDToSound(SND_STOMP), get_pos(), Sector::current()->player->get_pos());
         mode = FLAT;
         set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
         physic.set_velocity_x(0);
@@ -1070,7 +1052,7 @@ BadGuy::squish(Player* player)
         timer.start(4000);
       } else if (mode == FLAT) {
         /* Kick! */
-        sound_manager->play_sound(sounds[SND_KICK], this, Sector::current()->player->get_pos());
+        SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos());
 
         if (player->base.x < base.x + (base.width/2)) {
           physic.set_velocity_x(5);
@@ -1131,6 +1113,12 @@ BadGuy::squish(Player* player)
     {
       set_sprite(img_walkingtree_left_small, img_walkingtree_left_small);
       physic.set_velocity_x(physic.get_velocity_x() * 2.0f);
+
+      /* Move to the player's direction */
+      if(dir != Sector::current()->player->dir)
+        physic.set_velocity_x(-physic.get_velocity_x());
+      dir = Sector::current()->player->dir;
+
       // XXX magic number: 66 is BGM_BIG height
 
       player->bounce(this);
@@ -1171,7 +1159,7 @@ BadGuy::kill_me(int score)
                                 score * player_status.score_multiplier);
 
   /* Play death sound: */
-  sound_manager->play_sound(sounds[SND_FALL], this, Sector::current()->player->get_pos());
+  SoundManager::get()->play_sound(IDToSound(SND_FALL), this, Sector::current()->player->get_pos());
 }
 
 void
@@ -1314,9 +1302,9 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
               dir = RIGHT;
               physic.set_velocity_x(fabsf(physic.get_velocity_x()));
 
-              // in case badguys get "jammed"
-              if (physic.get_velocity_x() != 0)
-                base.x = pbad_c->base.x + pbad_c->base.width;
+              // Put bad guys a part (or they get jammed)
+              // only needed to do to one of them
+              base.x = pbad_c->base.x + pbad_c->base.width + 1;
             }
             else if (dir == RIGHT)
             {
@@ -1334,7 +1322,7 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
       /* Get kicked if were flat */
       if (mode == FLAT && !dying)
       {
-        sound_manager->play_sound(sounds[SND_KICK], this, Sector::current()->player->get_pos());
+        SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos());
 
         // Hit from left side
         if (player->base.x < base.x) {