X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fyeti.cpp;h=1c039068e459d39655fe99e5509964d354e5e3dd;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=42dbe4155badfa113b422026068cc04263ca3b78;hpb=b51a3e05e9212c00c3bf7d00c6c2bf33fe8e2970;p=supertux.git diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp index 42dbe4155..1c039068e 100644 --- a/src/badguy/yeti.cpp +++ b/src/badguy/yeti.cpp @@ -1,5 +1,5 @@ // $Id$ -// +// // SuperTux - Boss "Yeti" // Copyright (C) 2005 Matthias Braun // Copyright (C) 2006 Christoph Sommer @@ -13,7 +13,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // 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 @@ -32,17 +32,17 @@ namespace { const float JUMP_DOWN_VX = 250; /**< horizontal speed while jumping off the dais */ - const float JUMP_DOWN_VY = 250; /**< vertical speed while jumping off the dais */ + const float JUMP_DOWN_VY = -250; /**< vertical speed while jumping off the dais */ const float RUN_VX = 350; /**< horizontal speed while running */ const float JUMP_UP_VX = 350; /**< horizontal speed while jumping on the dais */ - const float JUMP_UP_VY = 800; /**< vertical speed while jumping on the dais */ + const float JUMP_UP_VY = -800; /**< vertical speed while jumping on the dais */ - const float STOMP_VY = 250; /** vertical speed while stomping on the dais */ + const float STOMP_VY = -250; /** vertical speed while stomping on the dais */ const float LEFT_STAND_X = 16; /**< x-coordinate of left dais' end position */ - const float RIGHT_STAND_X = 800-60-16; /**< x-coordinate of right dais' end position */ + const float RIGHT_STAND_X = 800-60-16; /**< x-coordinate of right dais' end position */ const float LEFT_JUMP_X = LEFT_STAND_X+224; /**< x-coordinate of from where to jump on the left dais */ const float RIGHT_JUMP_X = RIGHT_STAND_X-224; /**< x-coordinate of from where to jump on the right dais */ const float STOMP_WAIT = .5; /**< time we stay on the dais before jumping again */ @@ -53,14 +53,13 @@ namespace { } Yeti::Yeti(const lisp::Lisp& reader) + : BadGuy(reader, "images/creatures/yeti/yeti.sprite") { - reader.get("x", start_position.x); - reader.get("y", start_position.y); - sprite = sprite_manager->create("images/creatures/yeti/yeti.sprite"); - bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height()); hit_points = INITIAL_HITPOINTS; - reader.get("dead-script", dead_script); countMe = false; + sound_manager->preload("sounds/yeti_gna.wav"); + sound_manager->preload("sounds/yeti_roar.wav"); + hud_head.reset(new Surface("images/creatures/yeti/hudlife.png")); } Yeti::~Yeti() @@ -68,7 +67,7 @@ Yeti::~Yeti() } void -Yeti::activate() +Yeti::initialize() { dir = RIGHT; jump_down(); @@ -81,10 +80,32 @@ Yeti::draw(DrawingContext& context) if(safe_timer.started() && size_t(game_time*40)%2) return; + draw_hit_points(context); + BadGuy::draw(context); } void +Yeti::draw_hit_points(DrawingContext& context) +{ + int i; + + Surface *hh = hud_head.get(); + if (!hh) + return; + + context.push_transform(); + context.set_translation(Vector(0, 0)); + + for (i = 0; i < hit_points; ++i) + { + context.draw_surface(hh, Vector(BORDER_X + (i * hh->get_width()), BORDER_Y + 1), LAYER_FOREGROUND1); + } + + context.pop_transform(); +} + +void Yeti::active_update(float elapsed_time) { switch(state) { @@ -161,22 +182,25 @@ Yeti::be_angry() void Yeti::summon_snowball() { - Sector::current()->add_object(new BouncingSnowball(get_pos().x+(dir == RIGHT ? 64 : -64), get_pos().y, dir)); + Sector::current()->add_object(new BouncingSnowball(Vector(get_pos().x+(dir == RIGHT ? 64 : -64), get_pos().y), dir)); } bool -Yeti::collision_squished(Player& player) +Yeti::collision_squished(GameObject& object) { - kill_squished(player); + kill_squished(object); return true; } void -Yeti::kill_squished(Player& player) +Yeti::kill_squished(GameObject& object) { - player.bounce(*this); - take_hit(player); + Player* player = dynamic_cast(&object); + if (player) { + player->bounce(*this); + take_hit(*player); + } } void Yeti::take_hit(Player& ) @@ -192,15 +216,14 @@ void Yeti::take_hit(Player& ) physic.enable_gravity(true); physic.set_velocity_x(0); physic.set_velocity_y(0); - + state = SQUISHED; state_timer.start(SQUISH_TIME); - set_group(COLGROUP_MOVING_ONLY_STATIC); + set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC); sprite->set_action("dead"); if (countMe) Sector::current()->get_level()->stats.badguys++; - // start script if(dead_script != "") { std::istringstream stream(dead_script); Sector::current()->run_script(stream, "Yeti - dead-script"); @@ -215,7 +238,7 @@ void Yeti::kill_fall() { // shooting bullets or being invincible won't work :) - take_hit(*get_nearest_player()); // FIXME: debug only(?) + //take_hit(*get_nearest_player()); // FIXME: debug only(?) } void @@ -226,10 +249,6 @@ Yeti::write(lisp::Writer& writer) writer.write_float("x", start_position.x); writer.write_float("y", start_position.y); - if(dead_script != "") { - writer.write_string("dead-script", dead_script); - } - writer.end_list("yeti"); } @@ -237,7 +256,7 @@ void Yeti::drop_stalactite() { // make a stalactite falling down and shake camera a bit - Sector::current()->camera->shake(.1, 0, 10); + Sector::current()->camera->shake(.1f, 0, 10); YetiStalactite* nearest = 0; float dist = FLT_MAX; @@ -250,7 +269,7 @@ Yeti::drop_stalactite() i != sector->gameobjects.end(); ++i) { YetiStalactite* stalactite = dynamic_cast (*i); if(stalactite && stalactite->is_hanging()) { - float sdist + float sdist = fabsf(stalactite->get_pos().x - player->get_pos().x); if(sdist < dist) { nearest = stalactite; @@ -263,10 +282,10 @@ Yeti::drop_stalactite() nearest->start_shaking(); } -HitResponse -Yeti::collision_solid(GameObject& , const CollisionHit& hit) +void +Yeti::collision_solid(const CollisionHit& hit) { - if(fabsf(hit.normal.y) > .5) { + if(hit.top || hit.bottom) { // hit floor or roof physic.set_velocity_y(0); switch (state) { @@ -296,13 +315,10 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit) case SQUISHED: break; } - } else - if(fabsf(hit.normal.x) > .5) { + } else if(hit.left || hit.right) { // hit wall jump_up(); } - - return CONTINUE; } IMPLEMENT_FACTORY(Yeti, "yeti")