X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fmriceblock.cpp;h=8cf3bdbf26d3c7d80e26d70016f1cfda7d4b2f0c;hb=1980142d4600d3834e774d410798b47358aa555a;hp=cb801b30097b6e12bc90866b31204fcabcce6154;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp index cb801b300..8cf3bdbf2 100644 --- a/src/badguy/mriceblock.cpp +++ b/src/badguy/mriceblock.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // 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 -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,21 +12,30 @@ // 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. +// along with this program. If not, see . + +#include "badguy/mriceblock.hpp" -#include +#include "audio/sound_manager.hpp" +#include "object/player.hpp" +#include "sprite/sprite.hpp" +#include "sprite/sprite_manager.hpp" +#include "supertux/object_factory.hpp" -#include "mriceblock.hpp" -#include "object/block.hpp" +#include namespace { - const float KICKSPEED = 500; - const int MAXSQUISHES = 10; +const float KICKSPEED = 500; +const int MAXSQUISHES = 10; +const float NOKICK_TIME = 0.1f; } -MrIceBlock::MrIceBlock(const lisp::Lisp& reader) - : WalkingBadguy(reader, "images/creatures/mr_iceblock/mr_iceblock.sprite", "left", "right"), ice_state(ICESTATE_NORMAL), squishcount(0) +MrIceBlock::MrIceBlock(const Reader& reader) : + WalkingBadguy(reader, "images/creatures/mr_iceblock/mr_iceblock.sprite", "left", "right"), + ice_state(ICESTATE_NORMAL), + nokick_timer(), + flat_timer(), + squishcount(0) { walk_speed = 80; max_drop_height = 600; @@ -37,8 +44,12 @@ MrIceBlock::MrIceBlock(const lisp::Lisp& reader) sound_manager->preload("sounds/kick.wav"); } -MrIceBlock::MrIceBlock(const Vector& pos, Direction d) - : WalkingBadguy(pos, d, "images/creatures/mr_iceblock/mr_iceblock.sprite", "left", "right"), ice_state(ICESTATE_NORMAL), squishcount(0) +MrIceBlock::MrIceBlock(const Vector& pos, Direction d) : + WalkingBadguy(pos, d, "images/creatures/mr_iceblock/mr_iceblock.sprite", "left", "right"), + ice_state(ICESTATE_NORMAL), + nokick_timer(), + flat_timer(), + squishcount(0) { walk_speed = 80; max_drop_height = 600; @@ -48,17 +59,9 @@ MrIceBlock::MrIceBlock(const Vector& pos, Direction d) } void -MrIceBlock::write(lisp::Writer& writer) -{ - writer.start_list("mriceblock"); - WalkingBadguy::write(writer); - writer.end_list("mriceblock"); -} - -void -MrIceBlock::activate() +MrIceBlock::initialize() { - WalkingBadguy::activate(); + WalkingBadguy::initialize(); set_state(ICESTATE_NORMAL); } @@ -83,7 +86,7 @@ MrIceBlock::active_update(float elapsed_time) bool MrIceBlock::can_break(){ - return ice_state == ICESTATE_KICKED; + return ice_state == ICESTATE_KICKED; } void @@ -93,7 +96,6 @@ MrIceBlock::collision_solid(const CollisionHit& hit) if(hit.top || hit.bottom) { // floor or roof physic.set_velocity_y(0); - return; } // hit left or right @@ -102,16 +104,14 @@ MrIceBlock::collision_solid(const CollisionHit& hit) WalkingBadguy::collision_solid(hit); break; case ICESTATE_KICKED: { - if(hit.right && dir == RIGHT) { - dir = LEFT; - sound_manager->play("sounds/iceblock_bump.wav", get_pos()); - physic.set_velocity_x(-KICKSPEED); - } else if(hit.left && dir == LEFT) { - dir = RIGHT; + if((hit.right && dir == RIGHT) || (hit.left && dir == LEFT)) { + dir = (dir == LEFT) ? RIGHT : LEFT; sound_manager->play("sounds/iceblock_bump.wav", get_pos()); - physic.set_velocity_x(KICKSPEED); + physic.set_velocity_x(-physic.get_velocity_x()*.975); } - sprite->set_action(dir == LEFT ? "flat-left" : "flat-right"); + this->set_action(dir == LEFT ? "flat-left" : "flat-right", /* loops = */ -1); + if(fabsf(physic.get_velocity_x()) < walk_speed*1.5) + set_state(ICESTATE_NORMAL); break; } case ICESTATE_FLAT: @@ -134,13 +134,6 @@ MrIceBlock::collision(GameObject& object, const CollisionHit& hit) HitResponse MrIceBlock::collision_player(Player& player, const CollisionHit& hit) { - if(ice_state == ICESTATE_GRABBED) - return FORCE_MOVE; - - if(dir == UP) { - return FORCE_MOVE; - } - // handle kicks from left or right side if(ice_state == ICESTATE_FLAT && get_state() == STATE_ACTIVE) { if(hit.left) { @@ -180,66 +173,83 @@ MrIceBlock::collision_badguy(BadGuy& badguy, const CollisionHit& hit) bool MrIceBlock::collision_squished(GameObject& object) { + Player* player = dynamic_cast(&object); + if(player && (player->does_buttjump || player->is_invincible())) { + player->bounce(*this); + kill_fall(); + return true; + } + switch(ice_state) { case ICESTATE_KICKED: + { + BadGuy* badguy = dynamic_cast(&object); + if (badguy) { + badguy->kill_fall(); + break; + } + } + + // fall through case ICESTATE_NORMAL: + { squishcount++; - if(squishcount >= MAXSQUISHES) { + if (squishcount >= MAXSQUISHES) { kill_fall(); return true; } + } - set_state(ICESTATE_FLAT); - break; + set_state(ICESTATE_FLAT); + nokick_timer.start(NOKICK_TIME); + break; case ICESTATE_FLAT: - { - MovingObject* movingobject = dynamic_cast(&object); - if (movingobject && (movingobject->get_pos().x < get_pos().x)) { - dir = RIGHT; - } else { - dir = LEFT; - } + { + MovingObject* movingobject = dynamic_cast(&object); + if (movingobject && (movingobject->get_pos().x < get_pos().x)) { + dir = RIGHT; + } else { + dir = LEFT; } - set_state(ICESTATE_KICKED); - break; + } + if (nokick_timer.check()) set_state(ICESTATE_KICKED); + break; case ICESTATE_GRABBED: assert(false); break; } - Player* player = dynamic_cast(&object); if (player) player->bounce(*this); return true; } void -MrIceBlock::set_state(IceState state) +MrIceBlock::set_state(IceState state, bool up) { if(ice_state == state) return; switch(state) { case ICESTATE_NORMAL: - WalkingBadguy::activate(); + this->set_action(dir == LEFT ? "left" : "right", /* loops = */ -1); + WalkingBadguy::initialize(); break; case ICESTATE_FLAT: - if(dir == UP) { + if(up) { physic.set_velocity_y(-KICKSPEED); - bbox.set_size(34, 31.8f); } else { 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"); } + this->set_action(dir == LEFT ? "flat-left" : "flat-right", /* loops = */ -1); 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"); + this->set_action(dir == LEFT ? "flat-left" : "flat-right", /* loops = */ -1); // we should slide above 1 block holes now... bbox.set_size(34, 31.8f); break; @@ -257,17 +267,21 @@ MrIceBlock::grab(MovingObject&, const Vector& pos, Direction dir) { movement = pos - get_pos(); this->dir = dir; - sprite->set_action(dir == LEFT ? "flat-left" : "flat-right"); + this->set_action(dir == LEFT ? "flat-left" : "flat-right", /* loops = */ -1); set_state(ICESTATE_GRABBED); - set_group(COLGROUP_DISABLED); + set_colgroup_active(COLGROUP_DISABLED); } void MrIceBlock::ungrab(MovingObject& , Direction dir) { - this->dir = dir; - set_state(dir == UP ? ICESTATE_FLAT : ICESTATE_KICKED); - set_group(COLGROUP_MOVING); + if(dir == UP) { + set_state(ICESTATE_FLAT, true); + } else { + this->dir = dir; + set_state(ICESTATE_KICKED); + } + set_colgroup_active(COLGROUP_MOVING); } bool @@ -276,4 +290,11 @@ MrIceBlock::is_portable() const return ice_state == ICESTATE_FLAT; } -IMPLEMENT_FACTORY(MrIceBlock, "mriceblock") +SmartBlock::SmartBlock(const Reader& reader) : + MrIceBlock(reader) +{ + max_drop_height = 16; + sprite = sprite_manager->create("images/creatures/mr_iceblock/smart_block/smart_block.sprite"); +} + +/* EOF */