X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.cpp;h=16e5331e541816ab955098de35f60bb39cd7e442;hb=2d1bc69993923150eb701d3cacb917ab4e23d5ef;hp=56fe165b51289a3a1c9b3f6d8b8b323867aa6d71;hpb=339968d0eb222f5cad1397580631ab44acf40b10;p=supertux.git diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp index 56fe165b5..16e5331e5 100644 --- a/src/badguy/badguy.cpp +++ b/src/badguy/badguy.cpp @@ -17,7 +17,6 @@ // 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 "badguy.hpp" #include "object/camera.hpp" #include "object/tilemap.hpp" @@ -32,29 +31,38 @@ #include "random_generator.hpp" static const float SQUISH_TIME = 2; + static const float X_OFFSCREEN_DISTANCE = 1600; static const float Y_OFFSCREEN_DISTANCE = 1200; BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name, int layer) - : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true), dir(LEFT), start_dir(AUTO), frozen(false), ignited(false), draw_dead_script_hint(false), state(STATE_INIT), on_ground_flag(false) + : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true), is_initialized(false), + dir(LEFT), start_dir(AUTO), frozen(false), ignited(false), + state(STATE_INIT), on_ground_flag(false), colgroup_active(COLGROUP_MOVING) { start_position = bbox.p1; sound_manager->preload("sounds/squish.wav"); sound_manager->preload("sounds/fall.wav"); + + dir = (start_dir == AUTO) ? LEFT : start_dir; } BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite_name, int layer) - : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true), dir(direction), start_dir(direction), frozen(false), ignited(false), draw_dead_script_hint(false), state(STATE_INIT), on_ground_flag(false) + : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true), is_initialized(false), + dir(direction), start_dir(direction), frozen(false), ignited(false), + state(STATE_INIT), on_ground_flag(false), colgroup_active(COLGROUP_MOVING) { start_position = bbox.p1; sound_manager->preload("sounds/squish.wav"); sound_manager->preload("sounds/fall.wav"); + + dir = (start_dir == AUTO) ? LEFT : start_dir; } BadGuy::BadGuy(const lisp::Lisp& reader, const std::string& sprite_name, int layer) - : MovingSprite(reader, sprite_name, layer, COLGROUP_DISABLED), countMe(true), dir(LEFT), start_dir(AUTO), frozen(false), ignited(false), state(STATE_INIT), on_ground_flag(false) + : MovingSprite(reader, sprite_name, layer, COLGROUP_DISABLED), countMe(true), is_initialized(false), dir(LEFT), start_dir(AUTO), frozen(false), ignited(false), state(STATE_INIT), on_ground_flag(false), colgroup_active(COLGROUP_MOVING) { start_position = bbox.p1; @@ -62,12 +70,13 @@ BadGuy::BadGuy(const lisp::Lisp& reader, const std::string& sprite_name, int lay reader.get("direction", dir_str); start_dir = str2dir( dir_str ); dir = start_dir; - + reader.get("dead-script", dead_script); - draw_dead_script_hint = (dead_script != ""); sound_manager->preload("sounds/squish.wav"); sound_manager->preload("sounds/fall.wav"); + + dir = (start_dir == AUTO) ? LEFT : start_dir; } void @@ -84,11 +93,6 @@ BadGuy::draw(DrawingContext& context) context.set_drawing_effect(old_effect); } else { sprite->draw(context, get_pos(), layer); - if (draw_dead_script_hint) { - Vector ppos = Vector(systemRandom.randf(bbox.p1.x+8, bbox.p2.x-8), bbox.p2.y); - Vector pspeed = Vector(0, -100); - Sector::current()->add_object(new Particles(ppos, 44, 46, pspeed, Vector(0,0), 1, Color(.6, .2, .2), 3, .1, LAYER_OBJECTS+1)); - } } } @@ -96,24 +100,28 @@ void BadGuy::update(float elapsed_time) { if(!Sector::current()->inside(bbox)) { + is_active_flag = false; remove_me(); return; } - if(is_offscreen()) { + if ((state != STATE_INACTIVE) && is_offscreen()) { if (state == STATE_ACTIVE) deactivate(); set_state(STATE_INACTIVE); } switch(state) { case STATE_ACTIVE: + is_active_flag = true; active_update(elapsed_time); break; case STATE_INIT: case STATE_INACTIVE: + is_active_flag = false; inactive_update(elapsed_time); try_activate(); break; case STATE_SQUISHED: + is_active_flag = false; if(state_timer.check()) { remove_me(); break; @@ -121,6 +129,7 @@ BadGuy::update(float elapsed_time) movement = physic.get_movement(elapsed_time); break; case STATE_FALLING: + is_active_flag = false; movement = physic.get_movement(elapsed_time); break; } @@ -144,6 +153,11 @@ BadGuy::str2dir( std::string dir_str ) } void +BadGuy::initialize() +{ +} + +void BadGuy::activate() { } @@ -154,7 +168,7 @@ BadGuy::deactivate() } void -BadGuy::save(lisp::Writer& ) +BadGuy::write(lisp::Writer& ) { log_warning << "tried to write out a generic badguy" << std::endl; } @@ -176,7 +190,7 @@ BadGuy::collision_tile(uint32_t tile_attributes) if(tile_attributes & Tile::HURTS) { if (tile_attributes & Tile::FIRE) { if (is_flammable()) ignite(); - } + } else if (tile_attributes & Tile::ICE) { if (is_freezable()) freeze(); } @@ -189,50 +203,39 @@ BadGuy::collision_tile(uint32_t tile_attributes) HitResponse BadGuy::collision(GameObject& other, const CollisionHit& hit) { - switch(state) { - case STATE_INIT: - case STATE_INACTIVE: - return ABORT_MOVE; - case STATE_ACTIVE: { - BadGuy* badguy = dynamic_cast (&other); - if(badguy && badguy->state == STATE_ACTIVE && badguy->get_group() == COLGROUP_MOVING) { - - // hit from above? - if (badguy->get_bbox().p2.y < (bbox.p1.y + 16)) { - if(collision_squished(*badguy)) { - return ABORT_MOVE; - } - } - - return collision_badguy(*badguy, hit); - } - - Player* player = dynamic_cast (&other); - if(player) { + if (!is_active()) return ABORT_MOVE; - // hit from above? - if (player->get_bbox().p2.y < (bbox.p1.y + 16)) { - if(collision_squished(*player)) { - return ABORT_MOVE; - } - } + BadGuy* badguy = dynamic_cast (&other); + if(badguy && badguy->is_active() && badguy->get_group() == COLGROUP_MOVING) { - return collision_player(*player, hit); + // hit from above? + if (badguy->get_bbox().p2.y < (bbox.p1.y + 16)) { + if(collision_squished(*badguy)) { + return ABORT_MOVE; } + } + + return collision_badguy(*badguy, hit); + } - Bullet* bullet = dynamic_cast (&other); - if(bullet) - return collision_bullet(*bullet, hit); + Player* player = dynamic_cast (&other); + if(player) { - return FORCE_MOVE; + // hit from above? + if (player->get_bbox().p2.y < (bbox.p1.y + 16)) { + if(collision_squished(*player)) { + return ABORT_MOVE; + } } - case STATE_SQUISHED: - return FORCE_MOVE; - case STATE_FALLING: - return FORCE_MOVE; + + return collision_player(*player, hit); } - return ABORT_MOVE; + Bullet* bullet = dynamic_cast (&other); + if(bullet) + return collision_bullet(*bullet, hit); + + return FORCE_MOVE; } void @@ -283,7 +286,7 @@ BadGuy::collision_bullet(Bullet& bullet, const CollisionHit& hit) bullet.ricochet(*this, hit); return FORCE_MOVE; } - } + } else if (is_ignited()) { if(bullet.get_type() == ICE_BONUS) { // ice bullets extinguish ignited badguys @@ -343,6 +346,7 @@ BadGuy::kill_fall() sound_manager->play("sounds/fall.wav", get_pos()); if (countMe) Sector::current()->get_level()->stats.badguys++; physic.set_velocity_y(0); + physic.set_acceleration_y(0); physic.enable_gravity(true); set_state(STATE_FALLING); @@ -354,6 +358,19 @@ BadGuy::kill_fall() } void +BadGuy::run_dead_script() +{ + if (countMe) + Sector::current()->get_level()->stats.badguys++; + + // start dead-script + if(dead_script != "") { + std::istringstream stream(dead_script); + Sector::current()->run_script(stream, "dead-script"); + } +} + +void BadGuy::set_state(State state) { if(this->state == state) @@ -366,8 +383,8 @@ BadGuy::set_state(State state) state_timer.start(SQUISH_TIME); break; case STATE_ACTIVE: - set_group(COLGROUP_MOVING); - bbox.set_pos(start_position); + set_group(colgroup_active); + //bbox.set_pos(start_position); break; case STATE_INACTIVE: // was the badguy dead anyway? @@ -387,79 +404,40 @@ BadGuy::set_state(State state) bool BadGuy::is_offscreen() { - float scroll_x = Sector::current()->camera->get_translation().x; - float scroll_y = Sector::current()->camera->get_translation().y; - - if(bbox.p2.x < scroll_x - X_OFFSCREEN_DISTANCE - || bbox.p1.x > scroll_x + X_OFFSCREEN_DISTANCE + SCREEN_WIDTH - || bbox.p2.y < scroll_y - Y_OFFSCREEN_DISTANCE - || bbox.p1.y > scroll_y + Y_OFFSCREEN_DISTANCE + SCREEN_HEIGHT) - return true; - - return false; + Player* player = get_nearest_player(); + if (!player) return false; + Vector dist = player->get_bbox().get_middle() - get_bbox().get_middle(); + if ((dist.x <= X_OFFSCREEN_DISTANCE+32) && (dist.y <= Y_OFFSCREEN_DISTANCE+32)) { + return false; + } + return true; } void BadGuy::try_activate() { - float scroll_x = Sector::current()->camera->get_translation().x; - float scroll_y = Sector::current()->camera->get_translation().y; - - /* Activate badguys if they're just around the screen to avoid - * the effect of having badguys suddenly popping up from nowhere. - */ - //Badguy left of screen - if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE && - start_position.x < scroll_x - bbox.get_width() && - start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE && - start_position.y < scroll_y + SCREEN_HEIGHT + Y_OFFSCREEN_DISTANCE) { - if (start_dir != AUTO) dir = start_dir; else dir = RIGHT; + // In SuperTux 0.1.x, Badguys were activated when Tux<->Badguy center distance was approx. <= ~668px + // This doesn't work for wide-screen monitors which give us a virt. res. of approx. 1066px x 600px + Player* player = get_nearest_player(); + if (!player) return; + Vector dist = player->get_bbox().get_middle() - get_bbox().get_middle(); + if ((fabsf(dist.x) <= X_OFFSCREEN_DISTANCE) && (fabsf(dist.y) <= Y_OFFSCREEN_DISTANCE)) { set_state(STATE_ACTIVE); - activate(); - //Badguy right of screen - } else if (start_position.x > scroll_x + SCREEN_WIDTH && - start_position.x < scroll_x + SCREEN_WIDTH + X_OFFSCREEN_DISTANCE && - start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE && - start_position.y < scroll_y + SCREEN_HEIGHT + Y_OFFSCREEN_DISTANCE) { - if (start_dir != AUTO) dir = start_dir; else dir = LEFT; - set_state(STATE_ACTIVE); - activate(); - //Badguy over or under screen - } else if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE && - start_position.x < scroll_x + SCREEN_WIDTH + X_OFFSCREEN_DISTANCE && - ((start_position.y > scroll_y + SCREEN_HEIGHT && - start_position.y < scroll_y + SCREEN_HEIGHT + Y_OFFSCREEN_DISTANCE) || - (start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE && - start_position.y < scroll_y - bbox.get_height() ))) { - if (start_dir != AUTO) dir = start_dir; - else{ - // if nearest player is to our right, start facing right - Player* player = get_nearest_player(); - if (player && (player->get_bbox().p1.x > get_bbox().p2.x)) { - dir = RIGHT; - } else { - dir = LEFT; - } - } - set_state(STATE_ACTIVE); - activate(); - } else if(state == STATE_INIT - && start_position.x > scroll_x - X_OFFSCREEN_DISTANCE - && start_position.x < scroll_x + X_OFFSCREEN_DISTANCE + SCREEN_WIDTH - && start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE - && start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE + SCREEN_HEIGHT ) { - if (start_dir != AUTO) { - dir = start_dir; - } else { - // if nearest player is to our right, start facing right - Player* player = get_nearest_player(); - if (player && (player->get_bbox().p1.x > get_bbox().p2.x)) { - dir = RIGHT; - } else { - dir = LEFT; + if (!is_initialized) { + + // if starting direction was set to AUTO, this is our chance to re-orient the badguy + if (start_dir == AUTO) { + Player* player = get_nearest_player(); + if (player && (player->get_bbox().p1.x > get_bbox().p2.x)) { + dir = RIGHT; + } else { + dir = LEFT; + } } + + initialize(); + is_initialized = true; } - set_state(STATE_ACTIVE); activate(); } } @@ -492,6 +470,7 @@ BadGuy::get_nearest_player() std::vector players = Sector::current()->get_players(); for (std::vector::iterator playerIter = players.begin(); playerIter != players.end(); ++playerIter) { Player* player = *playerIter; + if (player->is_dying() || player->is_dead()) continue; return player; } @@ -513,6 +492,12 @@ BadGuy::on_ground() return on_ground_flag; } +bool +BadGuy::is_active() +{ + return is_active_flag; +} + Vector BadGuy::get_floor_normal() { @@ -529,7 +514,7 @@ BadGuy::freeze() void BadGuy::unfreeze() { - set_group(COLGROUP_MOVING); + set_group(colgroup_active); frozen = false; } @@ -545,26 +530,33 @@ BadGuy::is_frozen() const return frozen; } -void -BadGuy::ignite() +void +BadGuy::ignite() { kill_fall(); } -void -BadGuy::extinguish() +void +BadGuy::extinguish() { } -bool -BadGuy::is_flammable() const +bool +BadGuy::is_flammable() const { return true; } -bool -BadGuy::is_ignited() const +bool +BadGuy::is_ignited() const { return ignited; } + +void +BadGuy::set_colgroup_active(CollisionGroup group) +{ + this->colgroup_active = group; + if (state == STATE_ACTIVE) set_group(group); +}