Sprite* img_bouncingsnowball_left;
Sprite* img_bouncingsnowball_right;
Sprite* img_bouncingsnowball_squished;
Sprite* img_bouncingsnowball_left;
Sprite* img_bouncingsnowball_right;
Sprite* img_bouncingsnowball_squished;
else if (str == "bouncingsnowball")
return BAD_BOUNCINGSNOWBALL;
else if (str == "flyingsnowball")
else if (str == "bouncingsnowball")
return BAD_BOUNCINGSNOWBALL;
else if (str == "flyingsnowball")
{
std::cout << "Warning: badguy started in wall: kind: " << badguykind_to_string(kind)
<< " pos: (" << base.x << ", " << base.y << ")" << std::endl;
{
std::cout << "Warning: badguy started in wall: kind: " << badguykind_to_string(kind)
<< " pos: (" << base.x << ", " << base.y << ")" << std::endl;
} else if(kind == BAD_FISH) {
set_sprite(img_fish, img_fish);
physic.enable_gravity(true);
} else if(kind == BAD_FISH) {
set_sprite(img_fish, img_fish);
physic.enable_gravity(true);
} else if(kind == BAD_FLYINGSNOWBALL) {
set_sprite(img_flyingsnowball, img_flyingsnowball);
physic.enable_gravity(false);
} else if(kind == BAD_FLYINGSNOWBALL) {
set_sprite(img_flyingsnowball, img_flyingsnowball);
physic.enable_gravity(false);
- set_sprite(img_fish, img_fish);
+ if(kind == BAD_FISH)
+ set_sprite(img_fish, img_fish);
+ else // BAD_FLAMEFISH
+ set_sprite(img_flamefish, img_flamefish);
mode = NORMAL;
physic.set_velocity(0, JUMPV);
physic.enable_gravity(true);
mode = NORMAL;
physic.set_velocity(0, JUMPV);
physic.enable_gravity(true);
collision_swept_object_map(&old_base, &base);
if(physic.get_velocity_y() < 0)
collision_swept_object_map(&old_base, &base);
if(physic.get_velocity_y() < 0)
- set_sprite(img_fish_down, img_fish_down);
+ {
+ if(kind == BAD_FISH)
+ set_sprite(img_fish_down, img_fish_down);
+ else // BAD_FLAMEFISH
+ set_sprite(img_flamefish_down, img_flamefish_down);
+ }
// Jumpy, fish, flame, stalactites, wingling are exceptions
if (pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FLAME
// Jumpy, fish, flame, stalactites, wingling are exceptions
if (pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FLAME
img_fish_down = sprite_manager->load("fish-down");
img_fish_iced = sprite_manager->load("fish-iced");
img_fish_iced_down = sprite_manager->load("fish-iced-down");
img_fish_down = sprite_manager->load("fish-down");
img_fish_iced = sprite_manager->load("fish-iced");
img_fish_iced_down = sprite_manager->load("fish-iced-down");
img_bouncingsnowball_left = sprite_manager->load("bouncingsnowball-left");
img_bouncingsnowball_right = sprite_manager->load("bouncingsnowball-right");
img_bouncingsnowball_squished = sprite_manager->load("bouncingsnowball-squished");
img_bouncingsnowball_left = sprite_manager->load("bouncingsnowball-left");
img_bouncingsnowball_right = sprite_manager->load("bouncingsnowball-right");
img_bouncingsnowball_squished = sprite_manager->load("bouncingsnowball-squished");