Check if this fixes the jamming.

[supertux.git] / src / badguy.cpp

diff --git a/src/badguy.cpp b/src/badguy.cpp
index daff4ad..1009314 100644 (file)
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -23,14 +23,14 @@
 #include <iostream>
 #include <cmath>
 
-#include "globals.h"
+#include "app/globals.h"
 #include "defines.h"
+#include "special/sprite_manager.h"
+#include "utils/lispwriter.h"
 #include "badguy.h"
 #include "tile.h"
 #include "resources.h"
-#include "sprite_manager.h"
 #include "camera.h"
-#include "lispwriter.h"
 #include "level.h"
 #include "sector.h"
 #include "tilemap.h"
@@ -206,6 +206,7 @@ BadGuy::init()
   timer.init(true);
 
   // if we're in a solid tile at start correct that now
+  if(Sector::current()) {
   if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base)) 
     {
       std::cout << "Warning: badguy started in wall: kind: " << badguykind_to_string(kind) 
@@ -214,7 +215,7 @@ BadGuy::init()
         --base.y;
     }
 
-  if(Sector::current() && Sector::current()->camera) {
+  if(Sector::current()->camera) {
     Vector scroll = Sector::current()->camera->get_translation();
 
     if(start_position.x > scroll.x - X_OFFSCREEN_DISTANCE &&
@@ -223,7 +224,7 @@ BadGuy::init()
         start_position.y < scroll.y + screen->h + Y_OFFSCREEN_DISTANCE) {
       activate(LEFT);
     }
-  } else {
+  } } else {
     if(start_position.x > 0 && start_position.x <= screen->w
         && start_position.y > 0 && start_position.y <= screen->h)
       activate(LEFT);
@@ -320,7 +321,7 @@ BadGuy::action_mriceblock(double elapsed_time)
   if (mode != HELD)
     {
       // move
-      physic.apply(elapsed_time, base.x, base.y);
+      physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
       if (dying != DYING_FALLING)
         collision_swept_object_map(&old_base,&base);
     }
@@ -356,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);
+          SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos());
         }
     }
 
@@ -366,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());
+          SoundManager::get()->play_sound(IDToSound(SND_RICOCHET), get_pos(), Sector::current()->player->get_pos());
         }
     }
 
@@ -518,7 +519,7 @@ BadGuy::action_jumpy(double elapsed_time)
     dir = LEFT;
 
   // move
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if(dying == DYING_NOT)
     collision_swept_object_map(&old_base, &base);
 }
@@ -537,7 +538,7 @@ BadGuy::action_mrbomb(double elapsed_time)
 
   fall();
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if (dying != DYING_FALLING)
     collision_swept_object_map(&old_base,&base); 
 }
@@ -560,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);
+      SoundManager::get()->play_sound(IDToSound(SND_EXPLODE), this, Sector::current()->player->get_pos());
     } else if(mode == BOMB_EXPLODE) {
       remove_me();
       return;
@@ -568,7 +569,7 @@ BadGuy::action_bomb(double elapsed_time)
   }
 
   // move
-  physic.apply(elapsed_time, base.x, base.y);                 
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);                 
   collision_swept_object_map(&old_base,&base);
 }
 
@@ -609,7 +610,7 @@ BadGuy::action_stalactite(double elapsed_time)
   }
 
   // move
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
 
   if(dying == DYING_SQUISHED && !timer.check())
     remove_me();
@@ -663,7 +664,7 @@ BadGuy::action_fish(double elapsed_time)
       physic.enable_gravity(true);
     }
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if(dying == DYING_NOT)
     collision_swept_object_map(&old_base, &base);
 
@@ -692,7 +693,7 @@ BadGuy::action_bouncingsnowball(double elapsed_time)
   // check for right/left collisions
   check_horizontal_bump();
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if(dying == DYING_NOT)
     collision_swept_object_map(&old_base, &base);
 
@@ -728,7 +729,7 @@ BadGuy::action_flyingsnowball(double elapsed_time)
   if(dying != DYING_NOT)
     physic.enable_gravity(true);
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if(dying == DYING_NOT || dying == DYING_SQUISHED)
     collision_swept_object_map(&old_base, &base);
 
@@ -759,7 +760,7 @@ BadGuy::action_spiky(double elapsed_time)
   }
 #endif
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if (dying != DYING_FALLING)
     collision_swept_object_map(&old_base,&base);   
 }
@@ -772,7 +773,7 @@ BadGuy::action_snowball(double elapsed_time)
 
   fall();
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if (dying != DYING_FALLING)
     collision_swept_object_map(&old_base,&base);
 
@@ -804,7 +805,7 @@ BadGuy::action_wingling(double elapsed_time)
       physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0);
   }
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
 
 
   // Handle dying timer:
@@ -840,7 +841,7 @@ BadGuy::action_walkingtree(double elapsed_time)
   }
   
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if (dying != DYING_FALLING)
     collision_swept_object_map(&old_base,&base);
 
@@ -1028,12 +1029,12 @@ BadGuy::bump()
 void
 BadGuy::squish_me(Player* player)
 {
-  player->bounce();
+  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());
+  SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos());
   player_status.score_multiplier++;
 
   dying = DYING_SQUISHED;
@@ -1050,10 +1051,10 @@ BadGuy::squish(Player* player)
     // mrbomb transforms into a bomb now
     explode(false);
     
-    player->bounce();
+    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());
+    SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos());
     player_status.score_multiplier++;
     return;
 
@@ -1061,7 +1062,7 @@ BadGuy::squish(Player* player)
     if (mode == NORMAL || mode == KICK)
       {
         /* Flatten! */
-        sound_manager->play_sound(sounds[SND_STOMP], 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);
@@ -1069,7 +1070,7 @@ BadGuy::squish(Player* player)
         timer.start(4000);
       } else if (mode == FLAT) {
         /* Kick! */
-        sound_manager->play_sound(sounds[SND_KICK], this);
+        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);
@@ -1084,7 +1085,7 @@ BadGuy::squish(Player* player)
         set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
       }
 
-    player->bounce();
+    player->bounce(this);
 
     player_status.score_multiplier++;
 
@@ -1101,7 +1102,7 @@ BadGuy::squish(Player* player)
     if(physic.get_velocity_y() >= 0)
       return;
       
-    player->bounce();
+    player->bounce(this);
              
     Sector::current()->add_score(Vector(base.x, base.y),
                                 25 * player_status.score_multiplier);
@@ -1132,7 +1133,7 @@ BadGuy::squish(Player* player)
       physic.set_velocity_x(physic.get_velocity_x() * 2.0f);
       // XXX magic number: 66 is BGM_BIG height
 
-      player->bounce();
+      player->bounce(this);
       base.y += 66 - base.height;
              
       Sector::current()->add_score(Vector(base.x, base.y),
@@ -1170,7 +1171,7 @@ BadGuy::kill_me(int score)
                                 score * player_status.score_multiplier);
 
   /* Play death sound: */
-  sound_manager->play_sound(sounds[SND_FALL], this);
+  SoundManager::get()->play_sound(IDToSound(SND_FALL), this, Sector::current()->player->get_pos());
 }
 
 void
@@ -1313,9 +1314,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)
             {
@@ -1333,7 +1334,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);
+        SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos());
 
         // Hit from left side
         if (player->base.x < base.x) {