X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fspecial.cpp;h=594bce30962980c350375f50002c22850f4d1706;hb=e2e9c115fa08a7a22a5e0fd2d2dc451b81524a56;hp=8dd89ae618dc86aa7e9ea9f4fa96445d89cd5aa8;hpb=03fe5c560a616e7d38a8b1d5d11bfe4675fa8896;p=supertux.git

diff --git a/src/special.cpp b/src/special.cpp
index 8dd89ae61..594bce309 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -29,6 +29,7 @@
 #include "scene.h"
 #include "globals.h"
 #include "player.h"
+#include "sector.h"
 #include "sprite_manager.h"
 #include "resources.h"
 
@@ -50,6 +51,9 @@ Bullet::Bullet(const Vector& pos, float xm, int dir, int kind_)
   life_count = 3;
   base.width = 4;
   base.height = 4;
+  
+  if (kind == ICE_BULLET)
+    life_count = 6; //ice-bullets get "extra lives" for bumping off walls
 
   if (dir == RIGHT)
     {
@@ -62,7 +66,7 @@ Bullet::Bullet(const Vector& pos, float xm, int dir, int kind_)
       physic.set_velocity_x(-BULLET_XM + xm);
     }
 
-  base.y = pos.y + base.height/2;
+  base.y = pos.y;
   physic.set_velocity_y(-BULLET_STARTING_YM);
   old_base = base;
   kind = kind_;
@@ -94,19 +98,27 @@ Bullet::action(float elapsed_time)
     physic.set_velocity_y(-9);
 
   float scroll_x =
-    World::current()->camera->get_translation().x;
+    Sector::current()->camera->get_translation().x;
   float scroll_y =
-    World::current()->camera->get_translation().y;
+    Sector::current()->camera->get_translation().y;
   if (base.x < scroll_x ||
       base.x > scroll_x + screen->w ||
       base.y < scroll_y ||
       base.y > scroll_y + screen->h ||
-      issolid(base.x + 4, base.y + 2) ||
-      issolid(base.x, base.y + 2) ||
       life_count <= 0)
     {
       remove_me();
     }
+  if (issolid(base.x + 4, base.y + 2) || 
+      issolid(base.x, base.y + 2))
+     {
+       if (kind == FIRE_BULLET)
+         remove_me();
+       else if (kind == ICE_BULLET)
+         {
+	   physic.set_velocity_x(physic.get_velocity_x() * -1);
+	 }
+     }
 }
 
 void 
@@ -181,9 +193,9 @@ Upgrade::action(float elapsed_time)
 
   /* Away from the screen? Kill it! */
   float scroll_x =
-    World::current()->camera->get_translation().x;
+    Sector::current()->camera->get_translation().x;
   float scroll_y =                                                        
-    World::current()->camera->get_translation().y;
+    Sector::current()->camera->get_translation().y;
   
   if(base.x < scroll_x - X_OFFSCREEN_DISTANCE ||
       base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE ||
@@ -264,16 +276,21 @@ Upgrade::bump(Player* player)
   if(kind != UPGRADE_GROWUP)
     return;
 
-  play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER);
+  sound_manager->play_sound(sounds[SND_BUMP_UPGRADE], Vector(base.x, base.y));
   
   // determine new direction
+  Direction old_dir = dir;
   if (player->base.x + player->base.width/2 > base.x + base.width/2)
     dir = LEFT;
   else
     dir = RIGHT;
 
-  // do a little jump and change direction
-  physic.set_velocity(-physic.get_velocity_x(), 3);
+  // do a little jump and change direction (if necessary)
+  if (dir != old_dir)
+    physic.set_velocity(-physic.get_velocity_x(), 3);
+  else
+    physic.set_velocity_y(3);
+
   physic.enable_gravity(true);
 }
 
@@ -307,38 +324,38 @@ Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
 
       if (kind == UPGRADE_GROWUP)
         {
-          play_sound(sounds[SND_EXCELLENT], SOUND_CENTER_SPEAKER);
+          sound_manager->play_sound(sounds[SND_EXCELLENT]);
           pplayer->grow(true);
         }
       else if (kind == UPGRADE_FIREFLOWER)
         {
-          play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
+          sound_manager->play_sound(sounds[SND_COFFEE]);
           pplayer->grow(true);
           pplayer->got_power = pplayer->FIRE_POWER;
         }
       else if (kind == UPGRADE_ICEFLOWER)
         {
-          play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
+          sound_manager->play_sound(sounds[SND_COFFEE]);
           pplayer->grow(true);
           pplayer->got_power = pplayer->ICE_POWER;
         }
       else if (kind == UPGRADE_FIREFLOWER)
         {
-          play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
+          sound_manager->play_sound(sounds[SND_COFFEE]);
           pplayer->grow(true);
           pplayer->got_power = pplayer->FIRE_POWER;
         }
       else if (kind == UPGRADE_HERRING)
         {
-          play_sound(sounds[SND_HERRING], SOUND_CENTER_SPEAKER);
+          sound_manager->play_sound(sounds[SND_HERRING]);
           pplayer->invincible_timer.start(TUX_INVINCIBLE_TIME);
-          World::current()->play_music(HERRING_MUSIC);
+          Sector::current()->play_music(HERRING_MUSIC);
         }
       else if (kind == UPGRADE_1UP)
         {
           if(player_status.lives < MAX_LIVES) {
             player_status.lives++;
-            play_sound(sounds[SND_LIFEUP], SOUND_CENTER_SPEAKER);
+            sound_manager->play_sound(sounds[SND_LIFEUP]);
           }
         }
 
@@ -355,8 +372,8 @@ void load_special_gfx()
   img_star      = sprite_manager->load("star");
   img_1up       = sprite_manager->load("1up");
 
-  img_firebullet    = sprite_manager->load("firebullet");
-  img_icebullet    = sprite_manager->load("icebullet");
+  img_firebullet = sprite_manager->load("firebullet");
+  img_icebullet  = sprite_manager->load("icebullet");
 }
 
 void free_special_gfx()