X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy.cpp;h=db846834305bccd7b908b92c1dc00394f58f183b;hb=05802469d9bdacc1c4db6039026f7d09615576a2;hp=3c084fbc9414c5de446091487c02c602629de4b7;hpb=cf4a9fe888b3faa0fcfd45870af756a5955d9030;p=supertux.git diff --git a/src/badguy.cpp b/src/badguy.cpp index 3c084fbc9..db8468343 100644 --- a/src/badguy.cpp +++ b/src/badguy.cpp @@ -32,6 +32,10 @@ #include "tile.h" #include "resources.h" #include "sprite_manager.h" +#include "gameloop.h" +#include "display_manager.h" +#include "lispwriter.h" +#include "camera.h" Sprite* img_mriceblock_flat_left; Sprite* img_mriceblock_flat_right; @@ -70,8 +74,12 @@ Sprite* img_snowball_left; Sprite* img_snowball_right; Sprite* img_snowball_squished_left; Sprite* img_snowball_squished_right; +Sprite* img_wingling_left; +Sprite* img_walkingtree_left; +Sprite* img_walkingtree_left_small; #define BADGUY_WALK_SPEED .8f +#define WINGLING_FLY_SPEED 1.6f BadGuyKind badguykind_from_string(const std::string& str) { @@ -95,6 +103,10 @@ BadGuyKind badguykind_from_string(const std::string& str) return BAD_SPIKY; else if (str == "snowball" || str == "bsod") // was bsod in old maps return BAD_SNOWBALL; + else if (str == "wingling") + return BAD_WINGLING; + else if (str == "walkingtree") + return BAD_WALKINGTREE; else { printf("Couldn't convert badguy: '%s'\n", str.c_str()); @@ -136,52 +148,135 @@ std::string badguykind_to_string(BadGuyKind kind) case BAD_SNOWBALL: return "snowball"; break; + case BAD_WINGLING: + return "wingling"; + break; + case BAD_WALKINGTREE: + return "walkingtree"; default: return "snowball"; } } -BadGuy::BadGuy(float x, float y, BadGuyKind kind_, bool stay_on_platform_) +BadGuy::BadGuy(DisplayManager& display_manager, BadGuyKind kind_, + LispReader& lispreader) : removable(false), squishcount(0) { - base.x = x; - base.y = y; + display_manager.add_drawable(this, LAYER_OBJECTS); + + lispreader.read_float("x", &start_position.x); + lispreader.read_float("y", &start_position.y); + + kind = kind_; + + stay_on_platform = false; + lispreader.read_bool("stay-on-platform", &stay_on_platform); + + init(); +} + +BadGuy::BadGuy(DisplayManager& display_manager, BadGuyKind kind_, + float x, float y) +{ + display_manager.add_drawable(this, LAYER_OBJECTS); + + start_position.x = x; + start_position.y = y; + stay_on_platform = false; + + kind = kind_; + + init(); +} + +BadGuy::~BadGuy() +{ +} + +void +BadGuy::init() +{ + base.x = 0; + base.y = 0; base.width = 0; base.height = 0; - 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; - frozen_timer.init(true); animation_offset = 0; + target.x = target.y = -1; sprite_left = sprite_right = 0; physic.reset(); + frozen_timer.init(true); + timer.init(true); + + // if we're in a solid tile at start correct that now + if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base)) + { + std::cout << "Warning: badguy started in wall: kind: " << badguykind_to_string(kind) + << " pos: (" << base.x << ", " << base.y << ")" << std::endl; + while(collision_object_map(base)) + --base.y; + } + + if(World::current()->camera) { + Vector scroll = World::current()->camera->get_translation(); + + if(start_position.x > scroll.x - X_OFFSCREEN_DISTANCE && + start_position.x < scroll.x + screen->w + X_OFFSCREEN_DISTANCE && + start_position.y > scroll.y - Y_OFFSCREEN_DISTANCE && + start_position.y < scroll.y + screen->h + Y_OFFSCREEN_DISTANCE) { + activate(LEFT); + } + } +} + +void +BadGuy::write(LispWriter& writer) +{ + writer.start_list(badguykind_to_string(kind)); + + writer.write_float("x", base.x); + writer.write_float("y", base.y); + writer.write_bool("stay-on-platform", stay_on_platform); + + writer.end_list(badguykind_to_string(kind)); +} + +void +BadGuy::activate(Direction activation_dir) +{ + mode = NORMAL; + animation_offset = 0; + target.x = target.y = -1; + physic.reset(); + frozen_timer.init(true); timer.init(true); + dir = activation_dir; + float dirsign = activation_dir == LEFT ? -1 : 1; + if(kind == BAD_MRBOMB) { - physic.set_velocity(-BADGUY_WALK_SPEED, 0); + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); set_sprite(img_mrbomb_left, img_mrbomb_right); } else if (kind == BAD_MRICEBLOCK) { - physic.set_velocity(-BADGUY_WALK_SPEED, 0); + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); set_sprite(img_mriceblock_left, img_mriceblock_right); } else if(kind == BAD_JUMPY) { 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); - // hack so that the bomb doesn't hurt until it expldes... + // 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 + angle = 0; physic.enable_gravity(false); set_sprite(img_flame, img_flame); } else if(kind == BAD_BOUNCINGSNOWBALL) { - physic.set_velocity(-1.3, 0); + physic.set_velocity(dirsign * 1.3, 0); set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right); } else if(kind == BAD_STALACTITE) { physic.enable_gravity(false); @@ -193,25 +288,32 @@ BadGuy::BadGuy(float x, float y, BadGuyKind kind_, bool stay_on_platform_) set_sprite(img_flyingsnowball, img_flyingsnowball); physic.enable_gravity(false); } else if(kind == BAD_SPIKY) { - physic.set_velocity(-BADGUY_WALK_SPEED, 0); + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); set_sprite(img_spiky_left, img_spiky_right); } else if(kind == BAD_SNOWBALL) { - physic.set_velocity(-BADGUY_WALK_SPEED, 0); + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); set_sprite(img_snowball_left, img_snowball_right); + } else if(kind == BAD_WINGLING) { + physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0); + physic.enable_gravity(false); + set_sprite(img_wingling_left, img_wingling_left); + } else if (kind == BAD_WALKINGTREE) { + // TODO: why isn't the height/width being set properly in set_sprite? + physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0); + mode = BGM_BIG; + set_sprite(img_walkingtree_left, img_walkingtree_left); + base.width = 66; + base.height = 66; } - // if we're in a solid tile at start correct that now - if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base)) - { - std::cout << "Warning: badguy started in wall: kind: " << badguykind_to_string(kind) - << " pos: (" << base.x << ", " << base.y << ")" << std::endl; - while(collision_object_map(base)) - --base.y; - } + base.x = start_position.x; + base.y = start_position.y; + old_base = base; + seen = true; } void -BadGuy::action_mriceblock(double frame_ratio) +BadGuy::action_mriceblock(double elapsed_time) { Player& tux = *World::current()->get_tux(); @@ -222,7 +324,7 @@ BadGuy::action_mriceblock(double frame_ratio) if (mode != HELD) { // move - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); } @@ -268,6 +370,8 @@ BadGuy::action_mriceblock(double frame_ratio) check_horizontal_bump(); if(mode == KICK && changed != dir) { + float scroll_x = World::current()->camera->get_translation().x; + /* handle stereo sound (number 10 should be tweaked...)*/ if (base.x < scroll_x + screen->w/2 - 10) play_sound(sounds[SND_RICOCHET], SOUND_LEFT_SPEAKER); @@ -296,12 +400,18 @@ BadGuy::check_horizontal_bump(bool checkcliff) float halfheight = base.height / 2; if (dir == LEFT && issolid( base.x, (int) base.y + halfheight)) { + if (kind == BAD_MRICEBLOCK && mode == KICK) + World::current()->trybreakbrick(base.x, (int) base.y + halfheight, false); + dir = RIGHT; physic.set_velocity(-physic.get_velocity_x(), physic.get_velocity_y()); return; } if (dir == RIGHT && issolid( base.x + base.width, (int)base.y + halfheight)) { + if (kind == BAD_MRICEBLOCK && mode == KICK) + World::current()->trybreakbrick(base.x + base.width, (int) base.y + halfheight, false); + dir = LEFT; physic.set_velocity(-physic.get_velocity_x(), physic.get_velocity_y()); return; @@ -376,13 +486,7 @@ BadGuy::fall() } void -BadGuy::remove_me() -{ - removable = true; -} - -void -BadGuy::action_jumpy(double frame_ratio) +BadGuy::action_jumpy(double elapsed_time) { if(frozen_timer.check()) { @@ -425,13 +529,13 @@ BadGuy::action_jumpy(double frame_ratio) dir = LEFT; // move - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); if(dying == DYING_NOT) collision_swept_object_map(&old_base, &base); } void -BadGuy::action_mrbomb(double frame_ratio) +BadGuy::action_mrbomb(double elapsed_time) { if(frozen_timer.check()) { @@ -444,13 +548,13 @@ BadGuy::action_mrbomb(double frame_ratio) fall(); - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); } void -BadGuy::action_bomb(double frame_ratio) +BadGuy::action_bomb(double elapsed_time) { static const int TICKINGTIME = 1000; static const int EXPLODETIME = 1000; @@ -467,6 +571,8 @@ BadGuy::action_bomb(double frame_ratio) dying = DYING_NOT; // now the bomb hurts timer.start(EXPLODETIME); + float scroll_x = World::current()->camera->get_translation().x; + /* 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); @@ -482,12 +588,12 @@ BadGuy::action_bomb(double frame_ratio) } // move - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); collision_swept_object_map(&old_base,&base); } void -BadGuy::action_stalactite(double frame_ratio) +BadGuy::action_stalactite(double elapsed_time) { Player& tux = *World::current()->get_tux(); @@ -522,25 +628,25 @@ BadGuy::action_stalactite(double frame_ratio) } // move - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); if(dying == DYING_SQUISHED && !timer.check()) remove_me(); } void -BadGuy::action_flame(double frame_ratio) +BadGuy::action_flame(double elapsed_time) { static const float radius = 100; static const float speed = 0.02; - base.x = old_base.x + cos(base.ym) * radius; - base.y = old_base.y + sin(base.ym) * radius; + base.x = old_base.x + cos(angle) * radius; + base.y = old_base.y + sin(angle) * radius; - base.ym = fmodf(base.ym + frame_ratio * speed, 2*M_PI); + angle = fmodf(angle + elapsed_time * speed, 2*M_PI); } void -BadGuy::action_fish(double frame_ratio) +BadGuy::action_fish(double elapsed_time) { if(frozen_timer.check()) { @@ -574,7 +680,7 @@ BadGuy::action_fish(double frame_ratio) physic.enable_gravity(true); } - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); if(dying == DYING_NOT) collision_swept_object_map(&old_base, &base); @@ -583,7 +689,7 @@ BadGuy::action_fish(double frame_ratio) } void -BadGuy::action_bouncingsnowball(double frame_ratio) +BadGuy::action_bouncingsnowball(double elapsed_time) { static const float JUMPV = 4.5; @@ -603,21 +709,17 @@ BadGuy::action_bouncingsnowball(double frame_ratio) // check for right/left collisions check_horizontal_bump(); - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); if(dying == DYING_NOT) collision_swept_object_map(&old_base, &base); // Handle dying timer: if (dying == DYING_SQUISHED && !timer.check()) - { - /* Remove it if time's up: */ - remove_me(); - return; - } + remove_me(); } void -BadGuy::action_flyingsnowball(double frame_ratio) +BadGuy::action_flyingsnowball(double elapsed_time) { static const float FLYINGSPEED = 1; static const int DIRCHANGETIME = 1000; @@ -643,21 +745,17 @@ BadGuy::action_flyingsnowball(double frame_ratio) if(dying != DYING_NOT) physic.enable_gravity(true); - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); if(dying == DYING_NOT || dying == DYING_SQUISHED) collision_swept_object_map(&old_base, &base); // Handle dying timer: if (dying == DYING_SQUISHED && !timer.check()) - { - /* Remove it if time's up: */ - remove_me(); - return; - } + remove_me(); } void -BadGuy::action_spiky(double frame_ratio) +BadGuy::action_spiky(double elapsed_time) { if(frozen_timer.check()) { @@ -678,100 +776,198 @@ BadGuy::action_spiky(double frame_ratio) } #endif - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); } void -BadGuy::action_snowball(double frame_ratio) +BadGuy::action_snowball(double elapsed_time) { if (dying == DYING_NOT) check_horizontal_bump(); fall(); - physic.apply(frame_ratio, base.x, base.y); + physic.apply(elapsed_time, base.x, base.y); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); + + // Handle dying timer: + if (dying == DYING_SQUISHED && !timer.check()) + remove_me(); } void -BadGuy::action(double frame_ratio) +BadGuy::action_wingling(double elapsed_time) { - // Remove if it's far off the screen: - if (base.x < scroll_x - OFFSCREEN_DISTANCE) + if (dying != DYING_NOT) + physic.enable_gravity(true); + else + { + Player& tux = *World::current()->get_tux(); + int dirsign = physic.get_velocity_x() < 0 ? -1 : 1; + + if (fabsf(tux.base.x - base.x) < 150 && base.y < tux.base.y && tux.dying == DYING_NOT) { - remove_me(); - return; + if (target.x < 0 && target.y < 0) + { + target.x = tux.base.x; + target.y = tux.base.y; + physic.set_velocity(dirsign * 1.5f, -2.25f); + } } + else if (base.y >= target.y - 16) + physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0); + } + + physic.apply(elapsed_time, base.x, base.y); + + + // Handle dying timer: + if (dying == DYING_SQUISHED && !timer.check()) + remove_me(); + + // TODO: Winglings should be removed after flying off the screen +} + +void +BadGuy::action_walkingtree(double elapsed_time) +{ + if (dying == DYING_NOT) + check_horizontal_bump(); + + fall(); + physic.apply(elapsed_time, base.x, base.y); + if (dying != DYING_FALLING) + collision_swept_object_map(&old_base,&base); + + // Handle dying timer: + if (dying == DYING_SQUISHED && !timer.check()) + remove_me(); +} + + +void +BadGuy::action(float elapsed_time) +{ + float scroll_x = World::current()->camera->get_translation().x; + float scroll_y = World::current()->camera->get_translation().y; + // BadGuy fall below the ground - if (base.y > screen->h) { + if (base.y > World::current()->get_level()->height * 32) { remove_me(); return; } - // Once it's on screen, it's activated! - if (base.x <= scroll_x + screen->w + OFFSCREEN_DISTANCE) - seen = true; + // Kill us if we landed on spikes + if (dying == DYING_NOT + && (kind != BAD_STALACTITE && kind != BAD_FLAME && kind != BAD_BOMB) + && (isspike(base.x, base.y) || isspike(base.x + base.width, base.y) + || isspike(base.x, base.y + base.height) + || isspike(base.x + base.width, base.y + base.height))) + { + physic.set_velocity_y(3); + kill_me(0); + } + if(!seen) { + /* activate badguys if they're just inside the offscreen_distance around the + * screen. Don't activate them inside the screen, since that might have the + * effect of badguys suddenly popping up from nowhere + */ + if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE && + start_position.x < scroll_x - base.width) + activate(RIGHT); + else if(start_position.x > scroll_y - Y_OFFSCREEN_DISTANCE && + start_position.y < scroll_y - base.height) + activate(LEFT); + else if(start_position.x > scroll_x + screen->w && + start_position.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE) + activate(LEFT); + else if(start_position.y > scroll_y + screen->h && + start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE) + activate(LEFT); + } else { + if(base.x + base.width < scroll_x - X_OFFSCREEN_DISTANCE*4 + || base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE*4 + || base.y + base.height < scroll_y - Y_OFFSCREEN_DISTANCE*4 + || base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE*4) { + seen = false; + if(dying != DYING_NOT) + remove_me(); + } + } + if(!seen) return; - + switch (kind) { case BAD_MRICEBLOCK: - action_mriceblock(frame_ratio); + action_mriceblock(elapsed_time); break; case BAD_JUMPY: - action_jumpy(frame_ratio); + action_jumpy(elapsed_time); break; case BAD_MRBOMB: - action_mrbomb(frame_ratio); + action_mrbomb(elapsed_time); break; case BAD_BOMB: - action_bomb(frame_ratio); + action_bomb(elapsed_time); break; case BAD_STALACTITE: - action_stalactite(frame_ratio); + action_stalactite(elapsed_time); break; case BAD_FLAME: - action_flame(frame_ratio); + action_flame(elapsed_time); break; case BAD_FISH: - action_fish(frame_ratio); + action_fish(elapsed_time); break; case BAD_BOUNCINGSNOWBALL: - action_bouncingsnowball(frame_ratio); + action_bouncingsnowball(elapsed_time); break; case BAD_FLYINGSNOWBALL: - action_flyingsnowball(frame_ratio); + action_flyingsnowball(elapsed_time); break; case BAD_SPIKY: - action_spiky(frame_ratio); + action_spiky(elapsed_time); break; case BAD_SNOWBALL: - action_snowball(frame_ratio); + action_snowball(elapsed_time); + break; + + case BAD_WINGLING: + action_wingling(elapsed_time); break; + + case BAD_WALKINGTREE: + action_walkingtree(elapsed_time); + break; + default: break; } } void -BadGuy::draw() +BadGuy::draw(Camera& viewport, int) { + float scroll_x = viewport.get_translation().x; + float scroll_y = viewport.get_translation().y; + // Don't try to draw stuff that is outside of the screen if(base.x <= scroll_x - base.width || base.x >= scroll_x + screen->w) return; @@ -782,7 +978,7 @@ BadGuy::draw() } Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right; - sprite->draw(base.x, base.y); + sprite->draw(viewport.world2screen(Vector(base.x, base.y))); if (debug_mode) fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75,0,75, 150); @@ -846,8 +1042,8 @@ BadGuy::squish_me(Player* player) { make_player_jump(player); - World::current()->add_score(base.x, - base.y, 50 * player_status.score_multiplier); + World::current()->add_score(Vector(base.x, base.y), + 50 * player_status.score_multiplier); play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER); player_status.score_multiplier++; @@ -863,13 +1059,13 @@ BadGuy::squish(Player* player) if(kind == BAD_MRBOMB) { // mrbomb transforms into a bomb now - World::current()->add_bad_guy(base.x, base.y, BAD_BOMB); + explode(); make_player_jump(player); - World::current()->add_score(base.x, base.y, 50 * player_status.score_multiplier); + World::current()->add_score(Vector(base.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_MRICEBLOCK) { @@ -903,7 +1099,7 @@ BadGuy::squish(Player* player) player_status.score_multiplier++; - // check for maximum number of squiches + // check for maximum number of squishes squishcount++; if(squishcount >= MAX_ICEBLOCK_SQUICHES) { kill_me(50); @@ -918,7 +1114,8 @@ BadGuy::squish(Player* player) make_player_jump(player); - World::current()->add_score(base.x, base.y, 25 * player_status.score_multiplier); + World::current()->add_score(Vector(base.x, base.y), + 25 * player_status.score_multiplier); player_status.score_multiplier++; // simply remove the fish... @@ -936,6 +1133,27 @@ BadGuy::squish(Player* player) squish_me(player); set_sprite(img_snowball_squished_left, img_snowball_squished_right); return; + } else if(kind == BAD_WINGLING) { + squish_me(player); + set_sprite(img_wingling_left, img_wingling_left); + } else if(kind == BAD_WALKINGTREE) { + if (mode == BGM_BIG) + { + set_sprite(img_walkingtree_left_small, img_walkingtree_left_small); + physic.set_velocity_x(physic.get_velocity_x() * 2.0f); + // XXX magic number: 66 is BGM_BIG height + + make_player_jump(player); + base.y += 66 - base.height; + + World::current()->add_score(Vector(base.x, base.y), + 25 * player_status.score_multiplier); + player_status.score_multiplier++; + + mode = BGM_SMALL; + } + else + squish_me(player); } } @@ -954,21 +1172,29 @@ BadGuy::kill_me(int score) tux.holding_something = false; } } - + physic.enable_gravity(true); /* Gain some points: */ - World::current()->add_score(base.x, base.y, - score * player_status.score_multiplier); + if (score != 0) + World::current()->add_score(Vector(base.x, base.y), + score * player_status.score_multiplier); /* Play death sound: */ play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); } -void BadGuy::explode(BadGuy *badguy) +void +BadGuy::explode() +{ + World::current()->add_bad_guy(base.x, base.y, BAD_BOMB); + remove_me(); +} + +void +BadGuy::collision(const MovingObject&, int) { -World::current()->add_bad_guy(badguy->base.x, badguy->base.y, BAD_BOMB); -badguy->remove_me(); + // later } void @@ -996,16 +1222,14 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) if(pbullet_c->kind == FIRE_BULLET) { - if(kind == BAD_MRICEBLOCK || kind == BAD_STALACTITE || - kind == BAD_FISH || kind == BAD_BOUNCINGSNOWBALL || - kind == BAD_FLYINGSNOWBALL || kind == BAD_FLYINGSNOWBALL) - kill_me(10); + if (kind != BAD_BOMB && kind != BAD_STALACTITE && kind != BAD_FLAME) + kill_me(10); } else if(pbullet_c->kind == ICE_BULLET) { - if(kind == BAD_FLAME) - kill_me(10); - else + //if(kind == BAD_FLAME) + // kill_me(10); + //else frozen_timer.start(FROZEN_TIME); } break; @@ -1013,13 +1237,15 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) case CO_BADGUY: pbad_c = (BadGuy*) p_c_object; - /* If we're a kicked mriceblock, kill any badguys we hit */ - if(kind == BAD_MRICEBLOCK && mode == KICK) + + /* If we're a kicked mriceblock, kill [almost] any badguys we hit */ + if(kind == BAD_MRICEBLOCK && mode == KICK && + kind != BAD_FLAME && kind != BAD_BOMB && kind != BAD_STALACTITE) { pbad_c->kill_me(25); } - // a held mriceblock gets kills the enemy too but falls to ground then + // a held mriceblock kills the enemy too but falls to ground then else if(kind == BAD_MRICEBLOCK && mode == HELD) { pbad_c->kill_me(25); @@ -1032,7 +1258,7 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) if (pbad_c->kind == BAD_MRBOMB) { // mrbomb transforms into a bomb now - explode(pbad_c); + pbad_c->explode(); return; } else if (pbad_c->kind != BAD_MRBOMB) @@ -1047,7 +1273,7 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) if (pbad_c->kind == BAD_MRBOMB) { // mrbomb transforms into a bomb now - explode(pbad_c); + pbad_c->explode(); return; } else @@ -1057,7 +1283,11 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) /* When enemies run into eachother, make them change directions */ else { - // Jumpy, fish, flame, stalactites are exceptions + // Wingling doesn't interact with other badguys + if (pbad_c->kind == BAD_WINGLING || kind == BAD_WINGLING) + break; + + // Jumpy, fish, flame, stalactites, wingling are exceptions if (pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FLAME || pbad_c->kind == BAD_STALACTITE || pbad_c->kind == BAD_FISH) break; @@ -1076,8 +1306,6 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) physic.set_velocity(-fabsf(physic.get_velocity_x()), 2); } - - break; } else if (base.y + base.height > pbad_c->base.y + pbad_c->base.height) @@ -1089,6 +1317,10 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) { dir = RIGHT; physic.set_velocity_x(fabsf(physic.get_velocity_x())); + + // in case badguys get "jammed" + if (physic.get_velocity_x() != 0) + base.x = pbad_c->base.x + pbad_c->base.width; } else if (dir == RIGHT) { @@ -1170,6 +1402,9 @@ void load_badguy_gfx() img_snowball_right = sprite_manager->load("snowball-right"); img_snowball_squished_left = sprite_manager->load("snowball-squished-left"); img_snowball_squished_right = sprite_manager->load("snowball-squished-right"); + img_wingling_left = sprite_manager->load("wingling-left"); + img_walkingtree_left = sprite_manager->load("walkingtree-left"); + img_walkingtree_left_small = sprite_manager->load("walkingtree-left-small"); } void free_badguy_gfx()