X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fspecial.cpp;h=8d698151dffe119ae68f8a1fcc9d96c70d30111d;hb=e4db6eb50cd6bcba607858b5e6c4c5d53531ed1f;hp=e3f80615af9d8122e15b34a5d479d05ee3589c45;hpb=8ddb0f287c73dfd3c1c7548f266c4cd9b001f007;p=supertux.git diff --git a/src/special.cpp b/src/special.cpp index e3f80615a..8d698151d 100644 --- a/src/special.cpp +++ b/src/special.cpp @@ -1,107 +1,140 @@ +// $Id$ // -// C Implementation: special +// SuperTux - A Jump'n Run +// Copyright (C) 2003 Tobias Glaesser // -// Description: -// -// -// Author: Tobias Glaesser & 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 +#include -#include #include "SDL.h" + #include "defines.h" #include "special.h" +#include "camera.h" #include "gameloop.h" -#include "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 "special/sprite_manager.h" #include "resources.h" -Surface* img_bullet; -Surface* img_golden_herring; -Surface* img_growup; -Surface* img_iceflower; -Surface* img_1up; +Sprite* img_firebullet; +Sprite* img_icebullet; +Sprite* img_star; +Sprite* img_growup; +Sprite* img_iceflower; +Sprite* img_fireflower; +Sprite* img_1up; -void -Bullet::init(float x, float y, float xm, int dir) +#define GROWUP_SPEED 1.0f + +#define BULLET_STARTING_YM 0 +#define BULLET_XM 6 + +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) { - base.x = x + 32; - base.xm = BULLET_XM + xm; + base.x = pos.x + 32; + physic.set_velocity_x(BULLET_XM + xm); } else { - base.x = x; - base.xm = -BULLET_XM + xm; + base.x = pos.x; + physic.set_velocity_x(-BULLET_XM + xm); } - base.y = y; - base.ym = BULLET_STARTING_YM; + base.y = pos.y; + physic.set_velocity_y(-BULLET_STARTING_YM); old_base = base; + kind = kind_; } void -Bullet::remove_me() +Bullet::action(float elapsed_time) { - std::vector& bullets = World::current()->bullets; - for(std::vector::iterator i = bullets.begin(); - i != bullets.end(); ++i) { - if( & (*i) == this) { - bullets.erase(i); - return; - } - } + elapsed_time *= 0.5f; - assert(false); -} - -void -Bullet::action(double frame_ratio) -{ - base.x = base.x + base.xm * frame_ratio; - base.y = base.y + base.ym * frame_ratio; + float old_y = 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.ym = -base.ym; - base.y = (int)(base.y / 32) * 32; + base.y = old_y; + physic.set_velocity_y(-physic.get_velocity_y()); + life_count -= 1; } - base.ym = base.ym + GRAVITY; - + if(kind == FIRE_BULLET) + // @not framerate independant :-/ + physic.set_velocity_y(physic.get_velocity_y() - 0.5 * elapsed_time); + if(physic.get_velocity_y() > 9) + physic.set_velocity_y(9); + else if(physic.get_velocity_y() < -9) + physic.set_velocity_y(-9); + + float scroll_x = + Sector::current()->camera->get_translation().x; + float scroll_y = + Sector::current()->camera->get_translation().y; 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)) +// base.y < scroll_y || + base.y > scroll_y + screen->h || + 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 -Bullet::draw() +Bullet::draw(DrawingContext& context) { - 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); - } + Sprite* sprite = kind == FIRE_BULLET ? img_firebullet : img_icebullet; + + sprite->draw(context, Vector(base.x, base.y), LAYER_OBJECTS); +} + +void +Bullet::collision(const MovingObject& , int) +{ + // later } void @@ -112,54 +145,47 @@ Bullet::collision(int c_object) } } -void -Upgrade::init(float x_, float y_, int dir_, int kind_) +//--------------------------------------------------------------------------- + +Upgrade::Upgrade(const Vector& pos, Direction dir_, UpgradeKind kind_) { kind = kind_; dir = dir_; base.width = 32; base.height = 0; - base.x = x_; - base.y = y_; + base.x = pos.x; + base.y = pos.y; old_base = base; 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; - } 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); } else { physic.set_velocity(dir == LEFT ? -2 : 2, 0); } } -void -Upgrade::remove_me() +Upgrade::~Upgrade() { - std::vector& upgrades = World::current()->upgrades; - for(std::vector::iterator i = upgrades.begin(); - i != upgrades.end(); ++i) { - if( & (*i) == this) { - upgrades.erase(i); - return; - } - } - - assert(false); } void -Upgrade::action(double frame_ratio) +Upgrade::action(float elapsed_time) { - 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; + base.height = base.height + 0.7 * elapsed_time; if(base.height > 32) base.height = 32; @@ -167,20 +193,29 @@ 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! */ + float scroll_x = + Sector::current()->camera->get_translation().x; + float scroll_y = + Sector::current()->camera->get_translation().y; + + if(base.x < scroll_x - X_OFFSCREEN_DISTANCE || + base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE || + base.y < scroll_y - Y_OFFSCREEN_DISTANCE || + base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE) + { remove_me(); return; - } + } /* Move around? */ - physic.apply(frame_ratio, 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)) { @@ -188,8 +223,8 @@ Upgrade::action(double frame_ratio) old_base = base; if(kind == UPGRADE_GROWUP) { physic.enable_gravity(false); - physic.set_velocity(dir == LEFT ? -2 : 2, 0); - } else if(kind == UPGRADE_HERRING) { + physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0); + } else if(kind == UPGRADE_STAR) { physic.set_velocity(dir == LEFT ? -2 : 2, 3); } } @@ -204,7 +239,7 @@ Upgrade::action(double frame_ratio) } // 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 @@ -216,56 +251,70 @@ Upgrade::action(double frame_ratio) } void -Upgrade::draw() +Upgrade::draw(DrawingContext& context) { - SDL_Rect dest; - if (base.height < 32) - { - /* Rising up... */ + Sprite* sprite; + switch(kind) { + case UPGRADE_GROWUP: sprite = img_growup; break; + case UPGRADE_ICEFLOWER: sprite = img_iceflower; break; + case UPGRADE_FIREFLOWER: sprite = img_fireflower; 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 ! + } - dest.x = (int)(base.x - scroll_x); - dest.y = (int)(base.y + 32 - base.height); - dest.w = 32; - dest.h = (int)base.height; + if(base.height < 32) // still raising up? + sprite->draw(context, Vector(base.x, base.y + (32 - base.height)), + LAYER_TILES - 10); + else + sprite->draw(context, Vector(base.x, base.y), LAYER_OBJECTS); +} - 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_golden_herring->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); - } +void +Upgrade::bump(Player* player) +{ + // these can't be bumped + if(kind != UPGRADE_GROWUP) + return; + + 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 - { - if (kind == UPGRADE_GROWUP) - { - img_growup->draw( - base.x - scroll_x, base.y); - } - else if (kind == UPGRADE_ICEFLOWER) - { - img_iceflower->draw( - base.x - scroll_x, base.y); - } - else if (kind == UPGRADE_HERRING) - { - img_golden_herring->draw( - base.x - scroll_x, base.y); - } - else if (kind == UPGRADE_1UP) - { - img_1up->draw( base.x - scroll_x, base.y); - } - } + dir = RIGHT; + + // 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); } void -Upgrade::collision(void* p_c_object, int c_object) +Upgrade::collision(const MovingObject& , int) +{ + // later +} + +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: @@ -278,38 +327,38 @@ Upgrade::collision(void* p_c_object, int c_object) if (kind == UPGRADE_GROWUP) { - play_sound(sounds[SND_EXCELLENT], SOUND_CENTER_SPEAKER); - 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; - } + SoundManager::get()->play_sound(IDToSound(SND_EXCELLENT)); + pplayer->grow(true); + } + else if (kind == UPGRADE_FIREFLOWER) + { + SoundManager::get()->play_sound(IDToSound(SND_COFFEE)); + pplayer->grow(true); + pplayer->got_power = pplayer->FIRE_POWER; } else if (kind == UPGRADE_ICEFLOWER) { - play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER); - pplayer->got_coffee = true; + SoundManager::get()->play_sound(IDToSound(SND_COFFEE)); + pplayer->grow(true); + pplayer->got_power = pplayer->ICE_POWER; + } + else if (kind == UPGRADE_FIREFLOWER) + { + 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) { - play_sound(sounds[SND_HERRING], SOUND_CENTER_SPEAKER); + SoundManager::get()->play_sound(IDToSound(SND_HERRING)); 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(); - } + Sector::current()->play_music(HERRING_MUSIC); } else if (kind == UPGRADE_1UP) { - if(pplayer->lives < MAX_LIVES) { - pplayer->lives++; - play_sound(sounds[SND_LIFEUP], SOUND_CENTER_SPEAKER); + if(player_status.lives < MAX_LIVES) { + player_status.lives++; + SoundManager::get()->play_sound(IDToSound(SND_LIFEUP)); } } @@ -320,24 +369,17 @@ 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_fireflower = sprite_manager->load("fireflower"); + img_star = sprite_manager->load("star"); + img_1up = sprite_manager->load("1up"); + + img_firebullet = sprite_manager->load("firebullet"); + img_icebullet = sprite_manager->load("icebullet"); } void free_special_gfx() { - delete img_growup; - delete img_iceflower; - delete img_1up; - delete img_golden_herring; - delete img_bullet; }