- tweaked bullet and endsequence

[supertux.git] / src / special.cpp

diff --git a/src/special.cpp b/src/special.cpp
index 2272512..fe559fb 100644 (file)
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <assert.h>
+#include <iostream>
 #include "SDL.h"
 #include "defines.h"
 #include "special.h"
@@ -30,8 +31,7 @@
 #include "sprite_manager.h"
 #include "resources.h"
 
-Surface* img_bullet;
-
+Sprite* img_bullet;
 Sprite* img_star;
 Sprite* img_growup;
 Sprite* img_iceflower;
@@ -39,9 +39,13 @@ Sprite* img_1up;
 
 #define GROWUP_SPEED 1.0f
 
+#define BULLET_STARTING_YM 0
+#define BULLET_XM 6
+
 void
 Bullet::init(float x, float y, float xm, Direction dir)
 {
+  life_count = 3;
   base.width = 4;
   base.height = 4;
 
@@ -79,6 +83,10 @@ Bullet::remove_me()
 void
 Bullet::action(double frame_ratio)
 {
+  frame_ratio *= 0.5f;
+
+  float old_y = base.y;
+
   base.x = base.x + base.xm * frame_ratio;
   base.y = base.y + base.ym * frame_ratio;
 
@@ -86,18 +94,24 @@ Bullet::action(double frame_ratio)
       
   if (issolid(base.x, base.y + 4) || issolid(base.x, base.y))
     {
-      base.ym = -base.ym;
-      base.y = (int)(base.y / 32) * 32;
+      base.y  = old_y;
+      base.ym = -base.ym;     
+      if (base.ym > 9)
+        base.ym = 9;
+      else if (base.ym < -9)
+        base.ym = -9;
+      life_count -= 1;
     }
 
-  base.ym = base.ym + GRAVITY;
+  base.ym = base.ym + 0.5 * frame_ratio;
 
   if (base.x < scroll_x ||
       base.x > scroll_x + screen->w ||
       base.y < 0 ||
       base.y > screen->h ||
       issolid(base.x + 4, base.y + 2) ||
-      issolid(base.x, base.y + 2))
+      issolid(base.x, base.y + 2) ||
+      life_count <= 0)
     {
       remove_me();
     }
@@ -110,8 +124,7 @@ Bullet::draw()
   if (base.x >= scroll_x - base.width &&
       base.x <= scroll_x + screen->w)
     {
-      img_bullet->draw( base.x - scroll_x, base.y, 255,
-                   NO_UPDATE);
+      img_bullet->draw(base.x - scroll_x, base.y);
     }
 }
 
@@ -295,7 +308,7 @@ Upgrade::collision(void* p_c_object, int c_object)
           pplayer->size = BIG;
           pplayer->base.height = 64;
          pplayer->base.y -= 32;
-         if(collision_object_map(&pplayer->base))
+         if(collision_object_map(pplayer->base))
             {
               pplayer->base.height = 32;
               pplayer->base.y += 32;
@@ -306,17 +319,21 @@ Upgrade::collision(void* p_c_object, int c_object)
         {
           play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
           pplayer->got_coffee = true;
+          pplayer->size = BIG;
+          pplayer->base.height = 64;
+         pplayer->base.y -= 32;
+         if(collision_object_map(pplayer->base))
+            {
+              pplayer->base.height = 32;
+              pplayer->base.y += 32;
+              pplayer->duck = true;
+            }
         }
       else if (kind == UPGRADE_HERRING)
         {
           play_sound(sounds[SND_HERRING], SOUND_CENTER_SPEAKER);
           pplayer->invincible_timer.start(TUX_INVINCIBLE_TIME);
-          /* play the herring song ^^ */
-          if (get_current_music() != HURRYUP_MUSIC)
-            {
-              set_current_music(HERRING_MUSIC);
-              play_current_music();
-            }
+          World::current()->play_music(HERRING_MUSIC);
         }
       else if (kind == UPGRADE_1UP)
         {
@@ -338,8 +355,7 @@ void load_special_gfx()
   img_star      = sprite_manager->load("star");
   img_1up       = sprite_manager->load("1up");
 
-  img_bullet = new Surface(datadir + "/images/shared/bullet.png",
-                           USE_ALPHA);
+  img_bullet    = sprite_manager->load("bullet");
 }
 
 void free_special_gfx()