Fixed bug told in the mailing list:
[supertux.git] / src / special.cpp
index e21f2b5..b287476 100644 (file)
@@ -1,16 +1,24 @@
+//  $Id$
 //
-// C Implementation: special
+//  SuperTux -  A Jump'n Run
+//  Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
 //
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de> & Bill Kendrick, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
+//  You should have received a copy of the GNU General Public License
+//  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 <iostream>
 #include "SDL.h"
 #include "defines.h"
 #include "special.h"
 #include "scene.h"
 #include "globals.h"
 #include "player.h"
+#include "sprite_manager.h"
 #include "resources.h"
 
-Surface* img_bullet;
-Surface* img_golden_herring;
-Surface* img_growup;
-Surface* img_iceflower;
-Surface* img_1up;
+Sprite* img_bullet;
+Sprite* img_star;
+Sprite* img_growup;
+Sprite* img_iceflower;
+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, int dir)
+Bullet::init(float x, float y, float xm, Direction dir)
 {
+  life_count = 3;
   base.width = 4;
   base.height = 4;
 
@@ -70,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;
 
@@ -77,18 +94,23 @@ 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();
     }
@@ -101,8 +123,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);
     }
 }
 
@@ -115,7 +136,7 @@ Bullet::collision(int c_object)
 }
 
 void
-Upgrade::init(float x_, float y_, int dir_, UpgradeKind kind_)
+Upgrade::init(float x_, float y_, Direction dir_, UpgradeKind kind_)
 {
   kind = kind_;
   dir = dir_;
@@ -171,8 +192,12 @@ Upgrade::action(double frame_ratio)
     }
   }
 
-  /* Off screen? Kill it! */
-  if(base.x < scroll_x - base.width || base.y > screen->h) {
+  /* Away from the screen? Kill it! */
+  if(base.x < scroll_x - OFFSCREEN_DISTANCE) {
+      remove_me();
+      return;
+  }
+  if(base.y > screen->h) {
     remove_me();
     return;
   }
@@ -237,7 +262,7 @@ Upgrade::draw()
       else if (kind == UPGRADE_ICEFLOWER)
         img_iceflower->draw_part(0,0,dest.x,dest.y,dest.w,dest.h);
       else if (kind == UPGRADE_HERRING)
-        img_golden_herring->draw_part(0,0,dest.x,dest.y,dest.w,dest.h);
+        img_star->draw_part(0,0,dest.x,dest.y,dest.w,dest.h);
       else if (kind == UPGRADE_1UP)
         img_1up->draw_part( 0, 0, dest.x, dest.y, dest.w, dest.h);
     }
@@ -255,7 +280,7 @@ Upgrade::draw()
         }
       else if (kind == UPGRADE_HERRING)
         {
-          img_golden_herring->draw(
+          img_star->draw(
                        base.x - scroll_x, base.y);
         }
       else if (kind == UPGRADE_1UP)
@@ -266,10 +291,32 @@ Upgrade::draw()
 }
 
 void
-Upgrade::collision(void* p_c_object, int c_object)
+Upgrade::bump(Player* )
+{
+  // these can't be bumped
+  if(kind != UPGRADE_GROWUP)
+    return;
+
+  play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER);
+  
+  // do a little jump and change direction
+  physic.set_velocity(-physic.get_velocity_x(), 3);
+  dir = dir == LEFT ? RIGHT : LEFT;
+  physic.enable_gravity(true);
+}
+
+void
+Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
 {
   Player* pplayer = NULL;
 
+  if(type == COLLISION_BUMP) {
+    if(c_object == CO_PLAYER)
+      pplayer = (Player*) p_c_object;
+    bump(pplayer);
+    return;
+  }
+
   switch (c_object)
     {
     case CO_PLAYER:
@@ -286,7 +333,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;
@@ -297,17 +344,24 @@ Upgrade::collision(void* p_c_object, int c_object)
         {
           play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
           pplayer->got_coffee = true;
+          if (pplayer->size == SMALL)
+            {
+              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)
         {
@@ -324,23 +378,15 @@ Upgrade::collision(void* p_c_object, int c_object)
 
 void load_special_gfx()
 {
-    img_growup = new Surface(datadir + "/images/shared/egg.png", USE_ALPHA);
-    img_iceflower = new Surface(datadir + "/images/shared/iceflower.png",
-            USE_ALPHA);
-    img_golden_herring = new Surface(datadir + "/images/shared/star.png", USE_ALPHA);
-    img_1up = new Surface(datadir + "/images/shared/1up.png",
-            USE_ALPHA);
-
-    img_bullet = new Surface(datadir + "/images/shared/bullet.png",
-            USE_ALPHA);
+  img_growup    = sprite_manager->load("egg");
+  img_iceflower = sprite_manager->load("iceflower");
+  img_star      = sprite_manager->load("star");
+  img_1up       = sprite_manager->load("1up");
+
+  img_bullet    = sprite_manager->load("bullet");
 }
 
 void free_special_gfx()
 {
-    delete img_growup;
-    delete img_iceflower;
-    delete img_1up;
-    delete img_golden_herring;
-    delete img_bullet;
 }