X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmriceblock.cpp;h=3361f41ab2af87eb25cca11100d5c7044a2ae51d;hb=4c9b57d29e67f9db5605f378549b07f670baa837;hp=d37a2b5c797fbd4f203972cca4333db3c23386e0;hpb=523d415707de9f777729534f467779d4c5acdf6e;p=supertux.git diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp index d37a2b5c7..3361f41ab 100644 --- a/src/badguy/mriceblock.cpp +++ b/src/badguy/mriceblock.cpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,16 +12,15 @@ // 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 -// 02111-1307, USA. +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "mriceblock.h" -#include "object/block.h" +#include "mriceblock.hpp" +#include "object/block.hpp" static const float WALKSPEED = 80; static const float KICKSPEED = 500; @@ -33,7 +32,7 @@ MrIceBlock::MrIceBlock(const lisp::Lisp& reader) reader.get("x", start_position.x); reader.get("y", start_position.y); bbox.set_size(31.8, 31.8); - sprite = sprite_manager->create("mriceblock"); + sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite"); set_direction = false; } @@ -43,7 +42,7 @@ MrIceBlock::MrIceBlock(float pos_x, float pos_y, Direction d) start_position.x = pos_x; start_position.y = pos_y; bbox.set_size(31.8, 31.8); - sprite = sprite_manager->create("mriceblock"); + sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite"); set_direction = true; initial_direction = d; } @@ -62,7 +61,10 @@ MrIceBlock::write(lisp::Writer& writer) void MrIceBlock::activate() { - if (set_direction) {dir = initial_direction;} + if (set_direction) { + dir = initial_direction; + } + physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); sprite->set_action(dir == LEFT ? "left" : "right"); } @@ -70,11 +72,20 @@ MrIceBlock::activate() void MrIceBlock::active_update(float elapsed_time) { + if(ice_state == ICESTATE_GRABBED) + return; + if(ice_state == ICESTATE_FLAT && flat_timer.check()) { - ice_state = ICESTATE_NORMAL; - physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); + set_state(ICESTATE_NORMAL); + } + + if (ice_state == ICESTATE_NORMAL && might_fall(601)) + { + dir = (dir == LEFT ? RIGHT : LEFT); sprite->set_action(dir == LEFT ? "left" : "right"); + physic.set_velocity_x(-physic.get_velocity_x()); } + BadGuy::active_update(elapsed_time); } @@ -105,19 +116,54 @@ MrIceBlock::collision_solid(GameObject& object, const CollisionHit& hit) dir = dir == LEFT ? RIGHT : LEFT; sprite->set_action(dir == LEFT ? "flat-left" : "flat-right"); physic.set_velocity_x(-physic.get_velocity_x()); - sound_manager->play_sound("ricochet", get_pos(), - Sector::current()->player->get_pos()); + sound_manager->play("sounds/iceblock_bump.wav", get_pos()); break; } case ICESTATE_FLAT: physic.set_velocity_x(0); break; + case ICESTATE_GRABBED: + return FORCE_MOVE; } return CONTINUE; } HitResponse +MrIceBlock::collision(GameObject& object, const CollisionHit& hit) +{ + if(ice_state == ICESTATE_GRABBED) + return FORCE_MOVE; + + return BadGuy::collision(object, hit); +} + +HitResponse +MrIceBlock::collision_player(Player& player, const CollisionHit& hit) +{ + if(ice_state == ICESTATE_GRABBED) + return FORCE_MOVE; + + // handle kicks from left or right side + if(ice_state == ICESTATE_FLAT && get_state() == STATE_ACTIVE) { + // hit from left side + if(hit.normal.x > 0.7) { + dir = RIGHT; + player.kick(); + set_state(ICESTATE_KICKED); + return FORCE_MOVE; + } else if(hit.normal.x < -0.7) { + dir = LEFT; + player.kick(); + set_state(ICESTATE_KICKED); + return FORCE_MOVE; + } + } + + return BadGuy::collision_player(player, hit); +} + +HitResponse MrIceBlock::collision_badguy(BadGuy& badguy, const CollisionHit& hit) { switch(ice_state) { @@ -152,27 +198,18 @@ MrIceBlock::collision_squished(Player& player) return true; } - // flatten - sound_manager->play_sound("stomp", get_pos(), player.get_pos()); - physic.set_velocity_x(0); - physic.set_velocity_y(0); - - sprite->set_action(dir == LEFT ? "flat-left" : "flat-right"); - flat_timer.start(4); - ice_state = ICESTATE_FLAT; + set_state(ICESTATE_FLAT); break; case ICESTATE_FLAT: - // kick - sound_manager->play_sound("kick", this, player.get_pos()); - if(player.get_pos().x < get_pos().x) { dir = RIGHT; } else { dir = LEFT; } - physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED); - sprite->set_action(dir == LEFT ? "flat-left" : "flat-right"); - ice_state = ICESTATE_KICKED; + set_state(ICESTATE_KICKED); + break; + case ICESTATE_GRABBED: + assert(false); break; } @@ -180,4 +217,67 @@ MrIceBlock::collision_squished(Player& player) return true; } +void +MrIceBlock::set_state(IceState state) +{ + if(ice_state == state) + return; + + if(state == ICESTATE_FLAT) + flags |= FLAG_PORTABLE; + else + flags &= ~FLAG_PORTABLE; + + if(ice_state == ICESTATE_KICKED) { + bbox.set_size(31.8, 31.8); + } + + switch(state) { + case ICESTATE_NORMAL: + physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); + sprite->set_action(dir == LEFT ? "left" : "right"); + break; + case ICESTATE_FLAT: + sound_manager->play("sounds/stomp.wav", get_pos()); + physic.set_velocity_x(0); + physic.set_velocity_y(0); + + sprite->set_action(dir == LEFT ? "flat-left" : "flat-right"); + flat_timer.start(4); + break; + case ICESTATE_KICKED: + sound_manager->play("sounds/kick.wav", get_pos()); + + physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED); + sprite->set_action(dir == LEFT ? "flat-left" : "flat-right"); + // we should slide above 1 block holes now... + bbox.set_size(34, 31.8); + break; + case ICESTATE_GRABBED: + flat_timer.stop(); + break; + default: + assert(false); + } + ice_state = state; +} + +void +MrIceBlock::grab(MovingObject&, const Vector& pos, Direction dir) +{ + movement = pos - get_pos(); + this->dir = dir; + sprite->set_action(dir == LEFT ? "flat-left" : "flat-right"); + set_state(ICESTATE_GRABBED); + set_group(COLGROUP_DISABLED); +} + +void +MrIceBlock::ungrab(MovingObject& , Direction dir) +{ + this->dir = dir; + set_state(ICESTATE_KICKED); + set_group(COLGROUP_MOVING); +} + IMPLEMENT_FACTORY(MrIceBlock, "mriceblock")