#include "sprite_manager.h"
#include "resources.h"
-Sprite* img_bullet;
+Sprite* img_firebullet;
+Sprite* img_icebullet;
Sprite* img_star;
Sprite* img_growup;
Sprite* img_iceflower;
+Sprite* img_fireflower;
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, Direction dir)
+Bullet::Bullet(DisplayManager& display_manager, const Vector& pos, float xm,
+ int dir, int kind_)
{
+ display_manager.add_drawable(this, LAYER_OBJECTS);
+
life_count = 3;
base.width = 4;
base.height = 4;
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 + base.height/2;
+ physic.set_velocity_y(-BULLET_STARTING_YM);
old_base = base;
+ kind = kind_;
}
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;
- }
- }
-
- assert(false);
-}
-
-void
-Bullet::action(double frame_ratio)
+Bullet::action(float elapsed_time)
{
- frame_ratio *= 0.5f;
+ elapsed_time *= 0.5f;
float old_y = base.y;
- base.x = base.x + base.xm * frame_ratio;
- base.y = base.y + base.ym * frame_ratio;
-
+ physic.apply(elapsed_time, base.x, base.y);
collision_swept_object_map(&old_base,&base);
if (issolid(base.x, base.y + 4) || issolid(base.x, base.y))
{
base.y = old_y;
- base.ym = -base.ym;
- if (base.ym > 9)
- base.ym = 9;
- else if (base.ym < -9)
- base.ym = -9;
+ physic.set_velocity_y(-physic.get_velocity_y());
life_count -= 1;
}
- base.ym = base.ym + 0.5 * frame_ratio;
-
+ 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 =
+ World::current()->camera->get_translation().x;
+ float scroll_y =
+ World::current()->camera->get_translation().y;
if (base.x < scroll_x ||
base.x > scroll_x + screen->w ||
- base.y > screen->h ||
+ 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();
}
-
}
void
-Bullet::draw()
+Bullet::draw(Camera& viewport, int )
{
- if (base.x >= scroll_x - base.width &&
- base.x <= scroll_x + screen->w)
- {
- img_bullet->draw(base.x - scroll_x, base.y);
- }
+ if(kind == FIRE_BULLET)
+ img_firebullet->draw(viewport.world2screen(Vector(base.x, base.y)));
+ else if(kind == ICE_BULLET)
+ img_icebullet->draw(viewport.world2screen(Vector(base.x, base.y)));
+}
+
+void
+Bullet::collision(const MovingObject& , int)
+{
+ // later
}
void
}
}
-void
-Upgrade::init(float x_, float y_, Direction dir_, UpgradeKind kind_)
+//---------------------------------------------------------------------------
+
+Upgrade::Upgrade(DisplayManager& display_manager, const Vector& pos,
+ Direction dir_, UpgradeKind kind_)
{
+ display_manager.add_drawable(this, LAYER_OBJECTS);
+
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.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);
}
}
-void
-Upgrade::remove_me()
+Upgrade::~Upgrade()
{
- 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);
}
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;
}
/* Away from the screen? Kill it! */
- if(base.x < scroll_x - OFFSCREEN_DISTANCE) {
- remove_me();
- return;
- }
- if(base.y > screen->h) {
+ float scroll_x =
+ World::current()->camera->get_translation().x;
+ float scroll_y =
+ World::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);
+ physic.apply(elapsed_time, base.x, base.y);
if(kind == UPGRADE_GROWUP) {
collision_swept_object_map(&old_base, &base);
}
}
void
-Upgrade::draw()
+Upgrade::draw(Camera& viewport, int)
{
SDL_Rect dest;
+
if (base.height < 32)
{
/* Rising up... */
- dest.x = (int)(base.x - scroll_x);
- dest.y = (int)(base.y + 32 - base.height);
+ dest.x = (int)(base.x - viewport.get_translation().x);
+ dest.y = (int)(base.y + 32 - base.height - viewport.get_translation().y);
dest.w = 32;
dest.h = (int)base.height;
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)
{
if (kind == UPGRADE_GROWUP)
{
- img_growup->draw(
- base.x - scroll_x, base.y);
+ img_growup->draw(viewport.world2screen(Vector(base.x, base.y)));
}
else if (kind == UPGRADE_ICEFLOWER)
{
- img_iceflower->draw(
- base.x - scroll_x, base.y);
+ img_iceflower->draw(viewport.world2screen(Vector(base.x, base.y)));
+ }
+ else if (kind == UPGRADE_FIREFLOWER)
+ {
+ img_fireflower->draw(viewport.world2screen(Vector(base.x, base.y)));
}
else if (kind == UPGRADE_HERRING)
{
- img_star->draw(
- base.x - scroll_x, base.y);
+ img_star->draw(viewport.world2screen(Vector(base.x, base.y)));
}
else if (kind == UPGRADE_1UP)
{
- img_1up->draw( base.x - scroll_x, base.y);
+ img_1up->draw(viewport.world2screen(Vector(base.x, base.y)));
}
}
}
void
-Upgrade::bump(Player* )
+Upgrade::bump(Player* player)
{
// these can't be bumped
if(kind != UPGRADE_GROWUP)
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);
}
void
+Upgrade::collision(const MovingObject& , int)
+{
+ // later
+}
+
+void
Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
{
Player* pplayer = NULL;
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;
- }
+ pplayer->grow(true);
+ }
+ else if (kind == UPGRADE_FIREFLOWER)
+ {
+ play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
+ 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;
- if (pplayer->size == SMALL)
- {
- pplayer->size = BIG;
- pplayer->base.height = 64;
- pplayer->base.y -= 32;
- }
+ pplayer->grow(true);
+ pplayer->got_power = pplayer->ICE_POWER;
+ }
+ else if (kind == UPGRADE_FIREFLOWER)
+ {
+ play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
+ pplayer->grow(true);
+ pplayer->got_power = pplayer->FIRE_POWER;
}
else if (kind == UPGRADE_HERRING)
{
{
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_bullet = sprite_manager->load("bullet");
+ img_firebullet = sprite_manager->load("firebullet");
+ img_icebullet = sprite_manager->load("icebullet");
}
void free_special_gfx()
projects / supertux.git / blobdiff