converted player to new object system

[supertux.git] / src / special.cpp

diff --git a/src/special.cpp b/src/special.cpp
index 68cfb85..26c30c7 100644 (file)
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -36,6 +36,7 @@ Sprite* img_icebullet;
 Sprite* img_star;
 Sprite* img_growup;
 Sprite* img_iceflower;
+Sprite* img_fireflower;
 Sprite* img_1up;
 
 #define GROWUP_SPEED 1.0f
@@ -61,7 +62,7 @@ Bullet::init(float x, float y, float xm, Direction dir, int kind_)
       base.xm = -BULLET_XM + xm;
     }
 
-  base.y = y;
+  base.y = y + base.height/2;
   base.ym = BULLET_STARTING_YM;
   old_base = base;
   kind = kind_;
@@ -107,7 +108,7 @@ Bullet::action(double frame_ratio)
 
   if(kind == FIRE_BULLET)
     base.ym = base.ym + 0.5 * frame_ratio;
-  else if(kind == FIRE_BULLET)
+  else if(kind == ICE_BULLET)
     base.ym = 0;
 
   if (base.x < scroll_x ||
@@ -130,7 +131,7 @@ Bullet::draw()
     {
       if(kind == FIRE_BULLET)
         img_firebullet->draw(base.x, base.y);
-      else if(kind == FIRE_BULLET)
+      else if(kind == ICE_BULLET)
         img_icebullet->draw(base.x, base.y);
     }
 }
@@ -162,7 +163,7 @@ Upgrade::init(float x_, float y_, Direction dir_, UpgradeKind kind_)
     physic.set_velocity(dir == LEFT ? -1 : 1, 4);
     physic.enable_gravity(true);
     base.height = 32;
-  } else if (kind == UPGRADE_ICEFLOWER) {
+  } else if (kind == UPGRADE_ICEFLOWER || kind == UPGRADE_FIREFLOWER) {
     // nothing
   } else if (kind == UPGRADE_GROWUP) {
     physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0);
@@ -189,7 +190,8 @@ Upgrade::remove_me()
 void
 Upgrade::action(double frame_ratio)
 {
-  if (kind == UPGRADE_ICEFLOWER || kind == UPGRADE_GROWUP) {
+  if (kind == UPGRADE_ICEFLOWER || kind == UPGRADE_FIREFLOWER
+      || kind == UPGRADE_GROWUP) {
     if (base.height < 32) {
       /* Rise up! */
       base.height = base.height + 0.7 * frame_ratio;
@@ -270,6 +272,8 @@ Upgrade::draw()
         img_growup->draw_part(0,0,dest.x,dest.y,dest.w,dest.h);
       else if (kind == UPGRADE_ICEFLOWER)
         img_iceflower->draw_part(0,0,dest.x,dest.y,dest.w,dest.h);
+      else if (kind == UPGRADE_FIREFLOWER)
+        img_fireflower->draw_part(0,0,dest.x,dest.y,dest.w,dest.h);
       else if (kind == UPGRADE_HERRING)
         img_star->draw_part(0,0,dest.x,dest.y,dest.w,dest.h);
       else if (kind == UPGRADE_1UP)
@@ -287,6 +291,11 @@ Upgrade::draw()
           img_iceflower->draw(
                        base.x, base.y);
         }
+      else if (kind == UPGRADE_FIREFLOWER)
+        {
+          img_fireflower->draw(
+                       base.x, base.y);
+        }
       else if (kind == UPGRADE_HERRING)
         {
           img_star->draw(
@@ -300,7 +309,7 @@ Upgrade::draw()
 }
 
 void
-Upgrade::bump(Player* )
+Upgrade::bump(Player* player)
 {
   // these can't be bumped
   if(kind != UPGRADE_GROWUP)
@@ -308,9 +317,14 @@ Upgrade::bump(Player* )
 
   play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER);
   
+  // determine new direction
+  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);
-  dir = dir == LEFT ? RIGHT : LEFT;
   physic.enable_gravity(true);
 }
 
@@ -353,6 +367,12 @@ Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
           pplayer->grow();
           pplayer->got_power = pplayer->ICE_POWER;
         }
+      else if (kind == UPGRADE_FIREFLOWER)
+        {
+          play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
+          pplayer->grow();
+          pplayer->got_power = pplayer->FIRE_POWER;
+        }
       else if (kind == UPGRADE_HERRING)
         {
           play_sound(sounds[SND_HERRING], SOUND_CENTER_SPEAKER);
@@ -376,6 +396,7 @@ void load_special_gfx()
 {
   img_growup    = sprite_manager->load("egg");
   img_iceflower = sprite_manager->load("iceflower");
+  img_fireflower = sprite_manager->load("fireflower");
   img_star      = sprite_manager->load("star");
   img_1up       = sprite_manager->load("1up");