X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fspecial.cpp;h=8d698151dffe119ae68f8a1fcc9d96c70d30111d;hb=e4db6eb50cd6bcba607858b5e6c4c5d53531ed1f;hp=8dd89ae618dc86aa7e9ea9f4fa96445d89cd5aa8;hpb=03fe5c560a616e7d38a8b1d5d11bfe4675fa8896;p=supertux.git diff --git a/src/special.cpp b/src/special.cpp index 8dd89ae61..8d698151d 100644 --- a/src/special.cpp +++ b/src/special.cpp @@ -17,19 +17,21 @@ // 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/screen.h" -#include "sound.h" +#include "video/screen.h" #include "scene.h" -#include "globals.h" +#include "app/globals.h" #include "player.h" -#include "sprite_manager.h" +#include "sector.h" +#include "special/sprite_manager.h" #include "resources.h" Sprite* img_firebullet; @@ -50,6 +52,9 @@ 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) { @@ -62,7 +67,7 @@ Bullet::Bullet(const Vector& pos, float xm, int dir, int kind_) physic.set_velocity_x(-BULLET_XM + xm); } - base.y = pos.y + base.height/2; + base.y = pos.y; physic.set_velocity_y(-BULLET_STARTING_YM); old_base = base; kind = kind_; @@ -75,10 +80,10 @@ Bullet::action(float elapsed_time) float old_y = base.y; - physic.apply(elapsed_time, base.x, 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.y = old_y; physic.set_velocity_y(-physic.get_velocity_y()); @@ -94,19 +99,28 @@ Bullet::action(float elapsed_time) physic.set_velocity_y(-9); float scroll_x = - World::current()->camera->get_translation().x; + Sector::current()->camera->get_translation().x; float scroll_y = - World::current()->camera->get_translation().y; + Sector::current()->camera->get_translation().y; if (base.x < scroll_x || base.x > scroll_x + screen->w || - base.y < scroll_y || +// base.y < scroll_y || base.y > scroll_y + screen->h || - issolid(base.x + 4, base.y + 2) || - issolid(base.x, base.y + 2) || 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 @@ -147,7 +161,7 @@ Upgrade::Upgrade(const Vector& pos, Direction dir_, UpgradeKind kind_) 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; @@ -181,9 +195,9 @@ Upgrade::action(float elapsed_time) /* Away from the screen? Kill it! */ float scroll_x = - World::current()->camera->get_translation().x; + Sector::current()->camera->get_translation().x; float scroll_y = - World::current()->camera->get_translation().y; + Sector::current()->camera->get_translation().y; if(base.x < scroll_x - X_OFFSCREEN_DISTANCE || base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE || @@ -195,13 +209,13 @@ Upgrade::action(float elapsed_time) } /* Move around? */ - physic.apply(elapsed_time, 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)) { @@ -210,7 +224,7 @@ Upgrade::action(float elapsed_time) if(kind == UPGRADE_GROWUP) { physic.enable_gravity(false); physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0); - } else if(kind == UPGRADE_HERRING) { + } else if(kind == UPGRADE_STAR) { physic.set_velocity(dir == LEFT ? -2 : 2, 3); } } @@ -225,7 +239,7 @@ Upgrade::action(float elapsed_time) } // 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 @@ -244,10 +258,11 @@ Upgrade::draw(DrawingContext& context) case UPGRADE_GROWUP: sprite = img_growup; break; case UPGRADE_ICEFLOWER: sprite = img_iceflower; break; case UPGRADE_FIREFLOWER: sprite = img_fireflower; break; - case UPGRADE_HERRING: sprite = img_star; 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 ! } if(base.height < 32) // still raising up? @@ -264,16 +279,21 @@ Upgrade::bump(Player* player) if(kind != UPGRADE_GROWUP) return; - play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER); + 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 dir = RIGHT; - // do a little jump and change direction - physic.set_velocity(-physic.get_velocity_x(), 3); + // 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); } @@ -307,38 +327,38 @@ Upgrade::collision(void* p_c_object, int c_object, CollisionType type) if (kind == UPGRADE_GROWUP) { - play_sound(sounds[SND_EXCELLENT], SOUND_CENTER_SPEAKER); + SoundManager::get()->play_sound(IDToSound(SND_EXCELLENT)); pplayer->grow(true); } else if (kind == UPGRADE_FIREFLOWER) { - play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER); + 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); + SoundManager::get()->play_sound(IDToSound(SND_COFFEE)); pplayer->grow(true); pplayer->got_power = pplayer->ICE_POWER; } else if (kind == UPGRADE_FIREFLOWER) { - play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER); + 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); - World::current()->play_music(HERRING_MUSIC); + Sector::current()->play_music(HERRING_MUSIC); } else if (kind == UPGRADE_1UP) { if(player_status.lives < MAX_LIVES) { player_status.lives++; - play_sound(sounds[SND_LIFEUP], SOUND_CENTER_SPEAKER); + SoundManager::get()->play_sound(IDToSound(SND_LIFEUP)); } } @@ -355,8 +375,8 @@ void load_special_gfx() img_star = sprite_manager->load("star"); img_1up = sprite_manager->load("1up"); - img_firebullet = sprite_manager->load("firebullet"); - img_icebullet = sprite_manager->load("icebullet"); + img_firebullet = sprite_manager->load("firebullet"); + img_icebullet = sprite_manager->load("icebullet"); } void free_special_gfx()