X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.cpp;h=755723b5f977ae0afd4a912970cff026680fb301;hb=7c2f8e23f9accd00bd9ee2319da8ab8aa341c7cf;hp=ee2e347e486e96ed305428a5c5ef04812fbd9315;hpb=e50498b0a812cc8af84b0146ed917bb332471e8b;p=supertux.git diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp index ee2e347e4..755723b5f 100644 --- a/src/badguy/badguy.cpp +++ b/src/badguy/badguy.cpp @@ -16,7 +16,6 @@ // You should have received a copy of the GNU General Public License // 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" @@ -27,19 +26,43 @@ #include "game_session.hpp" #include "log.hpp" #include "level.hpp" +#include "object/bullet.hpp" +#include "main.hpp" static const float SQUISH_TIME = 2; static const float X_OFFSCREEN_DISTANCE = 1600; static const float Y_OFFSCREEN_DISTANCE = 1200; -BadGuy::BadGuy() - : countMe(true), sprite(0), dir(LEFT), layer(LAYER_OBJECTS), state(STATE_INIT) { - set_group(COLGROUP_DISABLED); +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), state(STATE_INIT) +{ + start_position = bbox.p1; + + sound_manager->preload("sounds/squish.wav"); + sound_manager->preload("sounds/fall.wav"); } -BadGuy::~BadGuy() +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), state(STATE_INIT) { - delete sprite; + start_position = bbox.p1; + + sound_manager->preload("sounds/squish.wav"); + sound_manager->preload("sounds/fall.wav"); +} + +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), state(STATE_INIT) +{ + start_position = bbox.p1; + + std::string dir_str = "auto"; + reader.get("direction", dir_str); + start_dir = str2dir( dir_str ); + dir = start_dir; + + sound_manager->preload("sounds/squish.wav"); + sound_manager->preload("sounds/fall.wav"); } void @@ -67,6 +90,7 @@ BadGuy::update(float elapsed_time) return; } if(is_offscreen()) { + if (state == STATE_ACTIVE) deactivate(); set_state(STATE_INACTIVE); } @@ -92,6 +116,21 @@ BadGuy::update(float elapsed_time) } } +Direction +BadGuy::str2dir( std::string dir_str ) +{ + if( dir_str == "auto" ) + return AUTO; + if( dir_str == "left" ) + return LEFT; + if( dir_str == "right" ) + return RIGHT; + + //default to "auto" + log_warning << "Badguy::str2dir: unknown direction \"" << dir_str << "\"\n"; + return dir; +} + void BadGuy::activate() { @@ -138,13 +177,17 @@ BadGuy::collision(GameObject& other, const CollisionHit& hit) return collision_solid(other, hit); BadGuy* badguy = dynamic_cast (&other); - if(badguy && badguy->state == STATE_ACTIVE) + if(badguy && badguy->state == STATE_ACTIVE && badguy->get_group() == COLGROUP_MOVING) return collision_badguy(*badguy, hit); Player* player = dynamic_cast (&other); if(player) return collision_player(*player, hit); + Bullet* bullet = dynamic_cast (&other); + if(bullet) + return collision_bullet(*bullet, hit); + return FORCE_MOVE; } case STATE_SQUISHED: @@ -167,11 +210,6 @@ BadGuy::collision_solid(GameObject& , const CollisionHit& ) HitResponse BadGuy::collision_player(Player& player, const CollisionHit& ) { - if(player.is_invincible()) { - kill_fall(); - return ABORT_MOVE; - } - /* printf("PlayerHit: GT %3.1f PM: %3.1f %3.1f BM: %3.1f %3.1f Hit: %3.1f %3.1f\n", game_time, @@ -181,15 +219,18 @@ BadGuy::collision_player(Player& player, const CollisionHit& ) */ // hit from above? - if(player.get_movement().y /*- get_movement().y*/ > 0 - && player.get_bbox().p2.y < - (get_bbox().p1.y + get_bbox().p2.y) / 2) { + if(player.get_bbox().p2.y < (bbox.p1.y + 16)) { // if it's not possible to squish us, then this will hurt if(collision_squished(player)) return ABORT_MOVE; } - player.kill(Player::SHRINK); + if(player.is_invincible()) { + kill_fall(); + return ABORT_MOVE; + } + + player.kill(false); return FORCE_MOVE; } @@ -205,6 +246,13 @@ BadGuy::collision_squished(Player& ) return false; } +HitResponse +BadGuy::collision_bullet(Bullet& , const CollisionHit& ) +{ + kill_fall(); + return ABORT_MOVE; +} + void BadGuy::kill_squished(Player& player) { @@ -283,35 +331,38 @@ BadGuy::try_activate() /* Activate badguys if they're just around the screen to avoid * the effect of having badguys suddenly popping up from nowhere. */ - if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE && + //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 + Y_OFFSCREEN_DISTANCE) { - dir = RIGHT; + if (start_dir != AUTO) dir = start_dir; else dir = RIGHT; set_state(STATE_ACTIVE); activate(); - } else if (start_position.x > scroll_x && - start_position.x < scroll_x + X_OFFSCREEN_DISTANCE && + //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 + Y_OFFSCREEN_DISTANCE) { - dir = LEFT; + 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 + X_OFFSCREEN_DISTANCE && - ((start_position.y > scroll_y && - start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) || - (start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE && - start_position.y < scroll_y))) { - dir = start_position.x < scroll_x ? RIGHT : LEFT; - set_state(STATE_ACTIVE); - activate(); + start_position.x < scroll_x + 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 dir = start_position.x < scroll_x ? RIGHT : 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 && start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE && start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) { - dir = LEFT; + if (start_dir != AUTO) dir = start_dir; else dir = LEFT; set_state(STATE_ACTIVE); activate(); }