Sprite* img_snowball_squished_left;
Sprite* img_snowball_squished_right;
+#define BADGUY_WALK_SPEED .8f
+
BadGuyKind badguykind_from_string(const std::string& str)
{
if (str == "money")
}
}
-void
-BadGuy::init(float x, float y, BadGuyKind kind_)
+BadGuy::BadGuy(float x, float y, BadGuyKind kind_, bool stay_on_platform_)
+ : removable(false)
{
base.x = x;
base.y = y;
base.xm = 0;
base.ym = 0;
+ stay_on_platform = stay_on_platform_;
mode = NORMAL;
dying = DYING_NOT;
kind = kind_;
old_base = base;
dir = LEFT;
seen = false;
- animation_speed = 1;
- animation_length = 1;
animation_offset = 0;
sprite_left = sprite_right = 0;
physic.reset();
timer.init(true);
if(kind == BAD_BSOD) {
- physic.set_velocity(-1.3, 0);
- set_sprite(img_bsod_left, img_bsod_right, 4);
+ physic.set_velocity(-BADGUY_WALK_SPEED, 0);
+ set_sprite(img_bsod_left, img_bsod_right);
} else if(kind == BAD_MRBOMB) {
- physic.set_velocity(-1.3, 0);
- set_sprite(img_mrbomb_left, img_mrbomb_right, 4);
+ physic.set_velocity(-BADGUY_WALK_SPEED, 0);
+ set_sprite(img_mrbomb_left, img_mrbomb_right);
} else if (kind == BAD_LAPTOP) {
- physic.set_velocity(-1.3, 0);
- set_sprite(img_laptop_left, img_laptop_right, 4, 5);
+ physic.set_velocity(-BADGUY_WALK_SPEED, 0);
+ set_sprite(img_laptop_left, img_laptop_right);
} else if(kind == BAD_MONEY) {
- set_sprite(img_jumpy_left_up, img_jumpy_left_up, 1);
+ set_sprite(img_jumpy_left_up, img_jumpy_left_up);
} else if(kind == BAD_BOMB) {
- set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right, 1);
+ set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right);
// hack so that the bomb doesn't hurt until it expldes...
dying = DYING_SQUISHED;
} else if(kind == BAD_FLAME) {
base.ym = 0; // we misuse base.ym as angle for the flame
physic.enable_gravity(false);
- set_sprite(img_flame, img_flame, 2, 0.5);
+ set_sprite(img_flame, img_flame);
} else if(kind == BAD_BOUNCINGSNOWBALL) {
physic.set_velocity(-1.3, 0);
- set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right, 6);
+ set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right);
} else if(kind == BAD_STALACTITE) {
physic.enable_gravity(false);
- set_sprite(img_stalactite, img_stalactite, 1);
+ set_sprite(img_stalactite, img_stalactite);
} else if(kind == BAD_FISH) {
- set_sprite(img_fish, img_fish, 2, 1);
+ set_sprite(img_fish, img_fish);
physic.enable_gravity(true);
} else if(kind == BAD_FLYINGSNOWBALL) {
- set_sprite(img_flyingsnowball, img_flyingsnowball, 2, 5);
+ set_sprite(img_flyingsnowball, img_flyingsnowball);
physic.enable_gravity(false);
} else if(kind == BAD_SPIKY) {
- physic.set_velocity(-1.3, 0);
- set_sprite(img_spiky_left, img_spiky_right, 3);
+ physic.set_velocity(-BADGUY_WALK_SPEED, 0);
+ set_sprite(img_spiky_left, img_spiky_right);
} else if(kind == BAD_SNOWBALL) {
- physic.set_velocity(-1.3, 0);
- set_sprite(img_snowball_left, img_snowball_right, 4, 5);
+ physic.set_velocity(-BADGUY_WALK_SPEED, 0);
+ set_sprite(img_snowball_left, img_snowball_right);
}
// if we're in a solid tile at start correct that now
- if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(&base)) {
+ if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base)) {
printf("Warning: badguy started in wall!.\n");
- while(collision_object_map(&base))
+ while(collision_object_map(base))
--base.y;
}
}
// jump when we're about to fall
if (physic.get_velocity_y() == 0 &&
- !issolid(base.x+base.width/2, base.y + base.height)) {
- physic.enable_gravity(true);
- physic.set_velocity(physic.get_velocity_x(), BSODJUMP);
- }
+ !issolid(base.x+base.width/2, base.y + base.height))
+ {
+ physic.enable_gravity(true);
+ physic.set_velocity(physic.get_velocity_x(), BSODJUMP);
+ }
// Handle dying timer:
if (dying == DYING_SQUISHED && !timer.check())
base.x = tux.base.x - 16;
base.y = tux.base.y + tux.base.height/1.5 - base.height;
}
- if(collision_object_map(&base))
+ if(collision_object_map(base))
{
base.x = tux.base.x;
base.y = tux.base.y + tux.base.height/1.5 - base.height;
old_base = base;
mode=KICK;
- set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1);
- physic.set_velocity((dir == LEFT) ? -8 : 8, -8);
+ set_sprite(img_laptop_flat_left, img_laptop_flat_right);
+ physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5);
play_sound(sounds[SND_KICK],SOUND_CENTER_SPEAKER);
}
}
if(!timer.check())
{
mode = NORMAL;
- set_sprite(img_laptop_left, img_laptop_right, 4, 5);
- physic.set_velocity( (dir == LEFT) ? -1.3 : 1.3, 0);
+ set_sprite(img_laptop_left, img_laptop_right);
+ physic.set_velocity( (dir == LEFT) ? -.8 : .8, 0);
}
}
}
if (physic.get_velocity_y() < 0)
{
base.y = int((base.y + base.height)/32) * 32 - base.height;
- physic.set_velocity(physic.get_velocity_x(), 0);
+ physic.set_velocity_y(0);
}
// no gravity anymore please
physic.enable_gravity(false);
+
+ if (stay_on_platform && mode == NORMAL)
+ {
+ if (!issolid(base.x + ((dir == LEFT) ? 0 : base.width),
+ base.y + base.height))
+ {
+ physic.set_velocity_x(-physic.get_velocity_x());
+ if (dir == LEFT)
+ dir = RIGHT;
+ else
+ dir = LEFT;
+ }
+ }
}
}
else
void
BadGuy::remove_me()
{
- for(std::vector<BadGuy>::iterator i = World::current()->bad_guys.begin();
- i != World::current()->bad_guys.end(); ++i)
- {
- if( & (*i) == this) {
- World::current()->bad_guys.erase(i);
- return;
- }
- }
+ removable = true;
}
void
BadGuy::action_money(float frame_ratio)
{
if (fabsf(physic.get_velocity_y()) < 2.5f)
- set_sprite(img_jumpy_left_middle, img_jumpy_left_middle, 1);
+ set_sprite(img_jumpy_left_middle, img_jumpy_left_middle);
else if (physic.get_velocity_y() < 0)
- set_sprite(img_jumpy_left_up, img_jumpy_left_up, 1);
+ set_sprite(img_jumpy_left_up, img_jumpy_left_up);
else
- set_sprite(img_jumpy_left_down, img_jumpy_left_down, 1);
+ set_sprite(img_jumpy_left_down, img_jumpy_left_down);
Player& tux = *World::current()->get_tux();
// jump when on ground
if(dying == DYING_NOT && issolid(base.x, base.y+32))
{
- physic.set_velocity(physic.get_velocity_x(), JUMPV);
+ physic.set_velocity_y(JUMPV);
physic.enable_gravity(true);
mode = MONEY_JUMP;
} else if(!timer.check()) {
if(mode == BOMB_TICKING) {
mode = BOMB_EXPLODE;
- set_sprite(img_mrbomb_explosion, img_mrbomb_explosion, 1);
+ set_sprite(img_mrbomb_explosion, img_mrbomb_explosion);
dying = DYING_NOT; // now the bomb hurts
timer.start(EXPLODETIME);
+
+ /* play explosion sound */ // FIXME: is the stereo all right? maybe we should use player cordinates...
+ if (base.x < scroll_x + screen->w/2 - 10)
+ play_sound(sounds[SND_EXPLODE], SOUND_LEFT_SPEAKER);
+ else if (base.x > scroll_x + screen->w/2 + 10)
+ play_sound(sounds[SND_EXPLODE], SOUND_RIGHT_SPEAKER);
+ else
+ play_sound(sounds[SND_EXPLODE], SOUND_CENTER_SPEAKER);
+
} else if(mode == BOMB_EXPLODE) {
remove_me();
return;
timer.start(2000);
dying = DYING_SQUISHED;
mode = FLAT;
- set_sprite(img_stalactite_broken, img_stalactite_broken, 1);
+ set_sprite(img_stalactite_broken, img_stalactite_broken);
}
} else if(mode == FLAT) {
fall();
else if(mode == FISH_WAIT && !timer.check())
{
// jump again
- set_sprite(img_fish, img_fish, 2, 2);
- animation_offset = global_frame_counter; // restart animation
+ set_sprite(img_fish, img_fish);
mode = NORMAL;
physic.set_velocity(0, JUMPV);
physic.enable_gravity(true);
// jump when on ground
if(dying == DYING_NOT && issolid(base.x, base.y+32))
{
- physic.set_velocity(physic.get_velocity_x(), JUMPV);
+ physic.set_velocity_y(JUMPV);
physic.enable_gravity(true);
}
else
// go into flyup mode if none specified yet
if(dying == DYING_NOT && mode == NORMAL) {
mode = FLY_UP;
- physic.set_velocity(physic.get_velocity_x(), FLYINGSPEED);
+ physic.set_velocity_y(FLYINGSPEED);
timer.start(DIRCHANGETIME/2);
}
if(dying == DYING_NOT && !timer.check()) {
if(mode == FLY_UP) {
mode = FLY_DOWN;
- physic.set_velocity(physic.get_velocity_x(), -FLYINGSPEED);
+ physic.set_velocity_y(-FLYINGSPEED);
} else if(mode == FLY_DOWN) {
mode = FLY_UP;
- physic.set_velocity(physic.get_velocity_x(), FLYINGSPEED);
+ physic.set_velocity_y(FLYINGSPEED);
}
timer.start(DIRCHANGETIME);
}
if (physic.get_velocity_y() == 0 &&
!issolid(base.x+base.width/2, base.y + base.height)) {
physic.enable_gravity(true);
- physic.set_velocity(physic.get_velocity_x(), 2);
+ physic.set_velocity_y(2);
}
#endif
if(sprite_left == 0 || sprite_right == 0)
{
- std::cout << "BadGuy: Error no sprite loaded" << std::endl;
return;
}
- float global_frame = (float(global_frame_counter - animation_offset) / 10);
- global_frame *= animation_speed;
- //size_t frame = size_t(global_frame) % animation_length;
Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right;
sprite->draw(base.x - scroll_x, base.y);
}
void
-BadGuy::set_sprite(Sprite* left, Sprite* right,
- int nanimlength, float nanimspeed)
+BadGuy::set_sprite(Sprite* left, Sprite* right)
{
if (1)
{
}
}
- animation_length = nanimlength;
- animation_speed = nanimspeed;
animation_offset = 0;
sprite_left = left;
sprite_right = right;
void
BadGuy::make_player_jump(Player* player)
{
- player->physic.set_velocity(player->physic.get_velocity_x(), 2);
+ player->physic.set_velocity_y(2);
player->base.y = base.y - player->base.height - 2;
}
World::current()->add_score(base.x - scroll_x, base.y, 50 * player_status.score_multiplier);
play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
player_status.score_multiplier++;
-
remove_me();
return;
} else if(kind == BAD_BSOD) {
squish_me(player);
- set_sprite(img_bsod_squished_left, img_bsod_squished_right, 1);
- physic.set_velocity(0, physic.get_velocity_y());
+ set_sprite(img_bsod_squished_left, img_bsod_squished_right);
+ physic.set_velocity_x(0);
return;
} else if (kind == BAD_LAPTOP) {
/* Flatten! */
play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
mode = FLAT;
- set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1);
- physic.set_velocity(0, physic.get_velocity_y());
+ set_sprite(img_laptop_flat_left, img_laptop_flat_right);
+ physic.set_velocity_x(0);
timer.start(4000);
} else if (mode == FLAT) {
play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
if (player->base.x < base.x + (base.width/2)) {
- physic.set_velocity(5, physic.get_velocity_y());
+ physic.set_velocity_x(5);
dir = RIGHT;
} else {
- physic.set_velocity(-5, physic.get_velocity_y());
+ physic.set_velocity_x(-5);
dir = LEFT;
}
mode = KICK;
- set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1);
+ set_sprite(img_laptop_flat_left, img_laptop_flat_right);
}
make_player_jump(player);
return;
} else if(kind == BAD_BOUNCINGSNOWBALL) {
squish_me(player);
- set_sprite(img_bouncingsnowball_squished,img_bouncingsnowball_squished,1);
+ set_sprite(img_bouncingsnowball_squished,img_bouncingsnowball_squished);
return;
} else if(kind == BAD_FLYINGSNOWBALL) {
squish_me(player);
- set_sprite(img_flyingsnowball_squished,img_flyingsnowball_squished,1);
+ set_sprite(img_flyingsnowball_squished,img_flyingsnowball_squished);
return;
} else if(kind == BAD_SNOWBALL) {
squish_me(player);
- set_sprite(img_snowball_squished_left, img_snowball_squished_right, 1);
+ set_sprite(img_snowball_squished_left, img_snowball_squished_right);
return;
}
}
dying = DYING_FALLING;
if(kind == BAD_LAPTOP)
- set_sprite(img_laptop_falling_left, img_laptop_falling_right, 1);
+ set_sprite(img_laptop_falling_left, img_laptop_falling_right);
else if(kind == BAD_BSOD)
- set_sprite(img_bsod_falling_left, img_bsod_falling_right, 1);
+ set_sprite(img_bsod_falling_left, img_bsod_falling_right);
physic.enable_gravity(true);
- physic.set_velocity(physic.get_velocity_x(), 0);
+ physic.set_velocity_y(0);
/* Gain some points: */
if (kind == BAD_BSOD)
bump();
return;
}
+
if(type == COLLISION_SQUISH) {
Player* player = static_cast<Player*>(p_c_object);
squish(player);
// Jumpy is an exception
if (pbad_c->kind == BAD_MONEY)
break;
+
+ // Bounce off of other badguy if we land on top of him
+ if (base.y + base.height < pbad_c->base.y + pbad_c->base.height)
+ {
+ Direction old_dir = dir;
+ if (pbad_c->dir == LEFT)
+ dir = RIGHT;
+ else if (pbad_c->dir == RIGHT)
+ dir = LEFT;
+
+ if (dir != old_dir)
+ physic.inverse_velocity_x();
+
+ physic.set_velocity(fabs(physic.get_velocity_x()), 2);
+
+ break;
+ }
+ else if (base.y + base.height > pbad_c->base.y + pbad_c->base.height)
+ break;
+
if (dir == LEFT)
dir = RIGHT;
else if (dir == RIGHT)
// Hit from left side
if (player->base.x < base.x) {
- physic.set_velocity(5, physic.get_velocity_y());
+ physic.set_velocity_x(5);
dir = RIGHT;
}
// Hit from right side
else {
- physic.set_velocity(-5, physic.get_velocity_y());
+ physic.set_velocity_x(-5);
dir = LEFT;
}
mode = KICK;
- set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1);
+ set_sprite(img_laptop_flat_left, img_laptop_flat_right);
}
break;
projects / supertux.git / blobdiff