X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fspecial.cpp;h=227251270a904b90f0e7808280da9dd5e2d205cd;hb=63934f5f4c15f059c9b60499575870ebb7c923a0;hp=9070f8e5ba177b2bf5ce04102c17e41cd4ef9330;hpb=6923b0b0fb10c3bcb17f03d7bbe159d034f07db2;p=supertux.git

diff --git a/src/special.cpp b/src/special.cpp
index 9070f8e5b..227251270 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -1,15 +1,23 @@
+//  $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 "SDL.h"
 #include "defines.h"
 #include "special.h"
@@ -19,210 +27,255 @@
 #include "scene.h"
 #include "globals.h"
 #include "player.h"
+#include "sprite_manager.h"
+#include "resources.h"
 
-texture_type img_bullet;
-texture_type img_golden_herring;
-bitmask* bm_bullet;
+Surface* img_bullet;
 
-void create_special_bitmasks()
-{
-  bm_bullet = bitmask_create_SDL(img_bullet.sdl_surface);
-}
+Sprite* img_star;
+Sprite* img_growup;
+Sprite* img_iceflower;
+Sprite* img_1up;
+
+#define GROWUP_SPEED 1.0f
 
-void bullet_init(bullet_type* pbullet, float x, float y, float xm, int dir)
+void
+Bullet::init(float x, float y, float xm, Direction dir)
 {
-  pbullet->base.width = 4;
-  pbullet->base.height = 4;
+  base.width = 4;
+  base.height = 4;
 
   if (dir == RIGHT)
     {
-      pbullet->base.x = x + 32;
-      pbullet->base.xm = BULLET_XM + xm;
+      base.x = x + 32;
+      base.xm = BULLET_XM + xm;
     }
   else
     {
-      pbullet->base.x = x;
-      pbullet->base.xm = -BULLET_XM + xm;
+      base.x = x;
+      base.xm = -BULLET_XM + xm;
+    }
+
+  base.y = y;
+  base.ym = BULLET_STARTING_YM;
+  old_base = base;
+}
+
+void
+Bullet::remove_me()
+{
+  std::vector<Bullet>& bullets = World::current()->bullets;
+  for(std::vector<Bullet>::iterator i = bullets.begin();
+         i != bullets.end(); ++i) {
+    if( & (*i) == this) {
+      bullets.erase(i);
+      return;
     }
+  }
 
-  pbullet->base.y = y;
-  pbullet->base.ym = BULLET_STARTING_YM;
-  pbullet->old_base = pbullet->base;
+  assert(false);
 }
 
-void bullet_action(bullet_type* pbullet)
+void
+Bullet::action(double frame_ratio)
 {
-  pbullet->base.x = pbullet->base.x + pbullet->base.xm * frame_ratio;
-  pbullet->base.y = pbullet->base.y + pbullet->base.ym * frame_ratio;
+  base.x = base.x + base.xm * frame_ratio;
+  base.y = base.y + base.ym * frame_ratio;
 
-  collision_swept_object_map(&pbullet->old_base,&pbullet->base);
+  collision_swept_object_map(&old_base,&base);
       
-  if (issolid(pbullet->base.x, pbullet->base.y + 4) || issolid(pbullet->base.x, pbullet->base.y))
+  if (issolid(base.x, base.y + 4) || issolid(base.x, base.y))
     {
-      pbullet->base.ym = -pbullet->base.ym;
-      pbullet->base.y = (int)(pbullet->base.y / 32) * 32;
+      base.ym = -base.ym;
+      base.y = (int)(base.y / 32) * 32;
     }
 
-  pbullet->base.ym = pbullet->base.ym + GRAVITY;
+  base.ym = base.ym + GRAVITY;
 
-  if (pbullet->base.x < scroll_x ||
-      pbullet->base.x > scroll_x + screen->w ||
-      pbullet->base.y < 0 ||
-      pbullet->base.y > screen->h ||
-      issolid(pbullet->base.x + 4, pbullet->base.y + 2) ||
-      issolid(pbullet->base.x, pbullet->base.y + 2))
+  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))
     {
-      world.bullets.erase(static_cast<std::vector<bullet_type>::iterator>(pbullet));
+      remove_me();
     }
 
 }
 
-void bullet_draw(bullet_type* pbullet)
+void 
+Bullet::draw()
 {
-  if (pbullet->base.x >= scroll_x - pbullet->base.width &&
-      pbullet->base.x <= scroll_x + screen->w)
+  if (base.x >= scroll_x - base.width &&
+      base.x <= scroll_x + screen->w)
     {
-      texture_draw(&img_bullet, pbullet->base.x - scroll_x, pbullet->base.y, 255,
+      img_bullet->draw( base.x - scroll_x, base.y, 255,
                    NO_UPDATE);
     }
 }
 
-void bullet_collision(bullet_type* pbullet, int c_object)
+void
+Bullet::collision(int c_object)
 {
   if(c_object == CO_BADGUY) {
-    std::vector<bullet_type>::iterator i;
-    
-    for(i = world.bullets.begin(); i != world.bullets.end(); ++i) {
-      if(& (*i) == pbullet) {
-        world.bullets.erase(i);
-        return;
-      }
-    }
+    remove_me();
   }
 }
 
-void upgrade_init(upgrade_type *pupgrade, float x, float y, int dir, int kind)
+void
+Upgrade::init(float x_, float y_, Direction dir_, UpgradeKind kind_)
 {
-  pupgrade->base.width = 32;
-  pupgrade->base.height = 0;
-  pupgrade->kind = kind;
-  pupgrade->base.x = x;
-  pupgrade->base.y = y;
-  if(dir == LEFT)
-    pupgrade->base.xm = -2;
-  else
-    pupgrade->base.xm = 2;
-  pupgrade->base.ym = -2;
-  pupgrade->base.height = 0;
-  pupgrade->old_base = pupgrade->base;
+  kind = kind_;
+  dir = dir_;
+
+  base.width = 32;
+  base.height = 0;
+  base.x = x_;
+  base.y = y_;
+  old_base = base;
+
+  physic.reset();
+  physic.enable_gravity(false);
+
+  if(kind == UPGRADE_1UP || kind == UPGRADE_HERRING) {
+    physic.set_velocity(dir == LEFT ? -1 : 1, 4);
+    physic.enable_gravity(true);
+    base.height = 32;
+  } else if (kind == UPGRADE_ICEFLOWER) {
+    // nothing
+  } else if (kind == UPGRADE_GROWUP) {
+    physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0);
+  } else {
+    physic.set_velocity(dir == LEFT ? -2 : 2, 0);
+  }
 }
 
-void upgrade_action(upgrade_type *pupgrade)
+void
+Upgrade::remove_me()
 {
+  std::vector<Upgrade>& upgrades = World::current()->upgrades;
+  for(std::vector<Upgrade>::iterator i = upgrades.begin();
+         i != upgrades.end(); ++i) {
+    if( & (*i) == this) {
+      upgrades.erase(i);
+      return;
+    }
+  }
 
+  assert(false);
+}
 
-  if (pupgrade->base.height < 32)
-    {
+void
+Upgrade::action(double frame_ratio)
+{
+  if (kind == UPGRADE_ICEFLOWER || kind == UPGRADE_GROWUP) {
+    if (base.height < 32) {
       /* Rise up! */
+      base.height = base.height + 0.7 * frame_ratio;
+      if(base.height > 32)
+        base.height = 32;
 
-      pupgrade->base.height = pupgrade->base.height + 0.7 * frame_ratio;
-      if(pupgrade->base.height > 32)
-        pupgrade->base.height = 32;
+      return;
     }
-  else
-    {
-      /* Move around? */
-
-      if (pupgrade->kind == UPGRADE_MINTS ||
-          pupgrade->kind == UPGRADE_HERRING)
-        {
-          pupgrade->base.x = pupgrade->base.x + pupgrade->base.xm * frame_ratio;
-          pupgrade->base.y = pupgrade->base.y + pupgrade->base.ym * frame_ratio;
-
-          collision_swept_object_map(&pupgrade->old_base,&pupgrade->base);
-
-          /* Off the screen?  Kill it! */
+  }
 
-          if (pupgrade->base.x < scroll_x - pupgrade->base.width)
-            world.upgrades.erase(static_cast<std::vector<upgrade_type>::iterator>(pupgrade));
-          if (pupgrade->base.y > screen->h)
-            world.upgrades.erase(static_cast<std::vector<upgrade_type>::iterator>(pupgrade));
+  /* Off screen? Kill it! */
+  if(base.x < scroll_x - base.width || base.y > screen->h) {
+    remove_me();
+    return;
+  }
 
-          if (issolid(pupgrade->base.x + 1, pupgrade->base.y + 32.) ||
-              issolid(pupgrade->base.x + 31., pupgrade->base.y + 32.))
-            {
-              if (pupgrade->base.ym > 0)
-                {
-                  if (pupgrade->kind == UPGRADE_MINTS)
-                    {
-                      pupgrade->base.ym = 0;
-                    }
-                  else if (pupgrade->kind == UPGRADE_HERRING)
-                    {
-                      pupgrade->base.ym = -8;
-                    }
-
-                  pupgrade->base.y = (int)(pupgrade->base.y / 32) * 32;
-                }
-            }
-          else
-            pupgrade->base.ym = pupgrade->base.ym + GRAVITY * frame_ratio;
+  /* Move around? */
+  physic.apply(frame_ratio, base.x, base.y);
+  if(kind == UPGRADE_GROWUP) {
+    collision_swept_object_map(&old_base, &base);
+  }
 
-          if (issolid(pupgrade->base.x - 1, (int) pupgrade->base.y))
-            {
-              if(pupgrade->base.xm < 0)
-                pupgrade->base.xm = -pupgrade->base.xm;
-            }
-          else if (issolid(pupgrade->base.x + pupgrade->base.width, (int) pupgrade->base.y))
-            {
-              if(pupgrade->base.xm > 0)
-                pupgrade->base.xm = -pupgrade->base.xm;
-            }
+  // fall down?
+  if(kind == UPGRADE_GROWUP || kind == UPGRADE_HERRING) {
+    // falling?
+    if(physic.get_velocity_y() != 0) {
+      if(issolid(base.x, base.y + base.height)) {
+        base.y = int(base.y / 32) * 32;
+        old_base = base;                         
+        if(kind == UPGRADE_GROWUP) {
+          physic.enable_gravity(false);
+          physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0);
+        } else if(kind == UPGRADE_HERRING) {
+          physic.set_velocity(dir == LEFT ? -2 : 2, 3);
         }
+      }
+    } else {
+      if((physic.get_velocity_x() < 0
+            && !issolid(base.x+base.width, base.y + base.height))
+        || (physic.get_velocity_x() > 0
+            && !issolid(base.x, base.y + base.height))) {
+        physic.enable_gravity(true);
+      }
+    }
+  }
 
+  // horizontal bounce?
+  if(kind == UPGRADE_GROWUP || kind == UPGRADE_HERRING) {
+    if (  (physic.get_velocity_x() < 0
+          && issolid(base.x, (int) base.y + base.height/2)) 
+        ||  (physic.get_velocity_x() > 0
+          && issolid(base.x + base.width, (int) base.y + base.height/2))) {
+        physic.set_velocity(-physic.get_velocity_x(),physic.get_velocity_y());
+        dir = dir == LEFT ? RIGHT : LEFT;
     }
+  }
 }
 
-void upgrade_draw(upgrade_type* pupgrade)
+void
+Upgrade::draw()
 {
   SDL_Rect dest;
-  if (pupgrade->base.height < 32)
+  if (base.height < 32)
     {
       /* Rising up... */
 
-      dest.x = (int)(pupgrade->base.x - scroll_x);
-      dest.y = (int)(pupgrade->base.y + 32 - pupgrade->base.height);
+      dest.x = (int)(base.x - scroll_x);
+      dest.y = (int)(base.y + 32 - base.height);
       dest.w = 32;
-      dest.h = (int)pupgrade->base.height;
-
-      if (pupgrade->kind == UPGRADE_MINTS)
-        texture_draw_part(&img_mints,0,0,dest.x,dest.y,dest.w,dest.h);
-      else if (pupgrade->kind == UPGRADE_COFFEE)
-        texture_draw_part(&img_coffee,0,0,dest.x,dest.y,dest.w,dest.h);
-      else if (pupgrade->kind == UPGRADE_HERRING)
-        texture_draw_part(&img_golden_herring,0,0,dest.x,dest.y,dest.w,dest.h);
+      dest.h = (int)base.height;
+
+      if (kind == UPGRADE_GROWUP)
+        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_HERRING)
+        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);
     }
   else
     {
-      if (pupgrade->kind == UPGRADE_MINTS)
+      if (kind == UPGRADE_GROWUP)
         {
-          texture_draw(&img_mints,
-                       pupgrade->base.x - scroll_x, pupgrade->base.y);
+          img_growup->draw(
+                       base.x - scroll_x, base.y);
         }
-      else if (pupgrade->kind == UPGRADE_COFFEE)
+      else if (kind == UPGRADE_ICEFLOWER)
         {
-          texture_draw(&img_coffee,
-                       pupgrade->base.x - scroll_x, pupgrade->base.y);
+          img_iceflower->draw(
+                       base.x - scroll_x, base.y);
         }
-      else if (pupgrade->kind == UPGRADE_HERRING)
+      else if (kind == UPGRADE_HERRING)
         {
-          texture_draw(&img_golden_herring,
-                       pupgrade->base.x - scroll_x, pupgrade->base.y);
+          img_star->draw(
+                       base.x - scroll_x, base.y);
+        }
+      else if (kind == UPGRADE_1UP)
+        {
+          img_1up->draw( base.x - scroll_x, base.y);
         }
     }
 }
 
-void upgrade_collision(upgrade_type* pupgrade, void* p_c_object, int c_object)
+void
+Upgrade::collision(void* p_c_object, int c_object)
 {
   Player* pplayer = NULL;
 
@@ -234,11 +287,9 @@ void upgrade_collision(upgrade_type* pupgrade, void* p_c_object, int c_object)
       /* p_c_object is CO_PLAYER, so assign it to pplayer */
       pplayer = (Player*) p_c_object;
 
-      world.upgrades.erase(static_cast<std::vector<upgrade_type>::iterator>(pupgrade));
-
       /* Affect the player: */
 
-      if (pupgrade->kind == UPGRADE_MINTS)
+      if (kind == UPGRADE_GROWUP)
         {
           play_sound(sounds[SND_EXCELLENT], SOUND_CENTER_SPEAKER);
           pplayer->size = BIG;
@@ -250,19 +301,16 @@ void upgrade_collision(upgrade_type* pupgrade, void* p_c_object, int c_object)
               pplayer->base.y += 32;
               pplayer->duck = true;
             }
-          timer_start(&super_bkgd_timer, 350);
         }
-      else if (pupgrade->kind == UPGRADE_COFFEE)
+      else if (kind == UPGRADE_ICEFLOWER)
         {
           play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
           pplayer->got_coffee = true;
-          timer_start(&super_bkgd_timer, 250);
         }
-      else if (pupgrade->kind == UPGRADE_HERRING)
+      else if (kind == UPGRADE_HERRING)
         {
           play_sound(sounds[SND_HERRING], SOUND_CENTER_SPEAKER);
-          timer_start(&pplayer->invincible_timer,TUX_INVINCIBLE_TIME);
-          timer_start(&super_bkgd_timer, 250);
+          pplayer->invincible_timer.start(TUX_INVINCIBLE_TIME);
           /* play the herring song ^^ */
           if (get_current_music() != HURRYUP_MUSIC)
             {
@@ -270,7 +318,32 @@ void upgrade_collision(upgrade_type* pupgrade, void* p_c_object, int c_object)
               play_current_music();
             }
         }
-      break;
+      else if (kind == UPGRADE_1UP)
+        {
+          if(player_status.lives < MAX_LIVES) {
+            player_status.lives++;
+            play_sound(sounds[SND_LIFEUP], SOUND_CENTER_SPEAKER);
+          }
+        }
+
+      remove_me();
+      return;
     }
 }
 
+void load_special_gfx()
+{
+  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 = new Surface(datadir + "/images/shared/bullet.png",
+                           USE_ALPHA);
+}
+
+void free_special_gfx()
+{
+  delete img_bullet;
+}
+