X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fspecial.cpp;h=8d698151dffe119ae68f8a1fcc9d96c70d30111d;hb=4c53a552c13dbe9d587e34e3cf48e82877d09288;hp=bcbd2a841c4d1238dc9bd09073eb43a786b2ea8e;hpb=f07a22ebe858958ba3f68bf55195474c9afe1e05;p=supertux.git

diff --git a/src/special.cpp b/src/special.cpp
index bcbd2a841..8d698151d 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -17,20 +17,21 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <assert.h>
+#include <cassert>
 #include <iostream>
+
 #include "SDL.h"
+
 #include "defines.h"
 #include "special.h"
 #include "camera.h"
 #include "gameloop.h"
-#include "screen/screen.h"
-#include "sound.h"
+#include "video/screen.h"
 #include "scene.h"
-#include "globals.h"
+#include "app/globals.h"
 #include "player.h"
 #include "sector.h"
-#include "sprite_manager.h"
+#include "special/sprite_manager.h"
 #include "resources.h"
 
 Sprite* img_firebullet;
@@ -51,6 +52,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)
     {
@@ -76,10 +80,10 @@ Bullet::action(float elapsed_time)
 
   float old_y = base.y;
 
-  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);
       
-  if (issolid(base.x, base.y + 4) || issolid(base.x, base.y))
+  if (issolid(base.x+2, base.y + 4) || issolid(base.x+2, base.y))
     {
       base.y  = old_y;
       physic.set_velocity_y(-physic.get_velocity_y());
@@ -100,14 +104,23 @@ Bullet::action(float elapsed_time)
     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 ||
       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());
+	   //physic.set_velocity_y(-physic.get_velocity_y());
+	 }
+     }
 }
 
 void 
@@ -148,7 +161,7 @@ Upgrade::Upgrade(const Vector& pos, Direction dir_, UpgradeKind kind_)
   physic.reset();
   physic.enable_gravity(false);
 
-  if(kind == UPGRADE_1UP || kind == UPGRADE_HERRING) {
+  if(kind == UPGRADE_1UP || kind == UPGRADE_STAR) {
     physic.set_velocity(dir == LEFT ? -1 : 1, 4);
     physic.enable_gravity(true);
     base.height = 32;
@@ -196,13 +209,13 @@ Upgrade::action(float elapsed_time)
     }
 
   /* Move around? */
-  physic.apply(elapsed_time, base.x, base.y);
-  if(kind == UPGRADE_GROWUP) {
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
+  if(kind == UPGRADE_GROWUP || kind == UPGRADE_STAR) {
     collision_swept_object_map(&old_base, &base);
   }
 
   // fall down?
-  if(kind == UPGRADE_GROWUP || kind == UPGRADE_HERRING) {
+  if(kind == UPGRADE_GROWUP || kind == UPGRADE_STAR) {
     // falling?
     if(physic.get_velocity_y() != 0) {
       if(issolid(base.x, base.y + base.height)) {
@@ -211,7 +224,7 @@ Upgrade::action(float elapsed_time)
         if(kind == UPGRADE_GROWUP) {
           physic.enable_gravity(false);
           physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0);
-        } else if(kind == UPGRADE_HERRING) {
+        } else if(kind == UPGRADE_STAR) {
           physic.set_velocity(dir == LEFT ? -2 : 2, 3);
         }
       }
@@ -226,7 +239,7 @@ Upgrade::action(float elapsed_time)
   }
 
   // horizontal bounce?
-  if(kind == UPGRADE_GROWUP || kind == UPGRADE_HERRING) {
+  if(kind == UPGRADE_GROWUP || kind == UPGRADE_STAR) {
     if (  (physic.get_velocity_x() < 0
           && issolid(base.x, (int) base.y + base.height/2)) 
         ||  (physic.get_velocity_x() > 0
@@ -245,10 +258,11 @@ Upgrade::draw(DrawingContext& context)
     case UPGRADE_GROWUP: sprite = img_growup; break;
     case UPGRADE_ICEFLOWER: sprite = img_iceflower; break;
     case UPGRADE_FIREFLOWER: sprite = img_fireflower; break;
-    case UPGRADE_HERRING: sprite = img_star; break;
+    case UPGRADE_STAR: sprite = img_star; break;
     case UPGRADE_1UP: sprite = img_1up; break;
     default:
       assert(!"wrong type in Powerup::draw()");
+      sprite = NULL;		// added by neoneurone, g++ likes this !
   }
 
   if(base.height < 32) // still raising up?
@@ -265,16 +279,21 @@ Upgrade::bump(Player* player)
   if(kind != UPGRADE_GROWUP)
     return;
 
-  sound_manager->play_sound(sounds[SND_BUMP_UPGRADE], Vector(base.x, base.y));
+  SoundManager::get()->play_sound(IDToSound(SND_BUMP_UPGRADE), Vector(base.x, base.y), Sector::current()->player->get_pos());
   
   // 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);
 }
 
@@ -308,30 +327,30 @@ Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
 
       if (kind == UPGRADE_GROWUP)
         {
-          sound_manager->play_sound(sounds[SND_EXCELLENT]);
+          SoundManager::get()->play_sound(IDToSound(SND_EXCELLENT));
           pplayer->grow(true);
         }
       else if (kind == UPGRADE_FIREFLOWER)
         {
-          sound_manager->play_sound(sounds[SND_COFFEE]);
+          SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
           pplayer->grow(true);
           pplayer->got_power = pplayer->FIRE_POWER;
         }
       else if (kind == UPGRADE_ICEFLOWER)
         {
-          sound_manager->play_sound(sounds[SND_COFFEE]);
+          SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
           pplayer->grow(true);
           pplayer->got_power = pplayer->ICE_POWER;
         }
       else if (kind == UPGRADE_FIREFLOWER)
         {
-          sound_manager->play_sound(sounds[SND_COFFEE]);
+          SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
           pplayer->grow(true);
           pplayer->got_power = pplayer->FIRE_POWER;
         }
-      else if (kind == UPGRADE_HERRING)
+      else if (kind == UPGRADE_STAR)
         {
-          sound_manager->play_sound(sounds[SND_HERRING]);
+          SoundManager::get()->play_sound(IDToSound(SND_HERRING));
           pplayer->invincible_timer.start(TUX_INVINCIBLE_TIME);
           Sector::current()->play_music(HERRING_MUSIC);
         }
@@ -339,7 +358,7 @@ Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
         {
           if(player_status.lives < MAX_LIVES) {
             player_status.lives++;
-            sound_manager->play_sound(sounds[SND_LIFEUP]);
+            SoundManager::get()->play_sound(IDToSound(SND_LIFEUP));
           }
         }
 
@@ -356,8 +375,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()