X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Frock.cpp;h=7c56e1afcba5e517494ee5be08f48fd6674a03ec;hb=1dfbd27a41341f26775ca4e2b9ca4864f5744a6f;hp=3a27757ccd793e71b1e3849629b88d16cbe7fe1f;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/object/rock.cpp b/src/object/rock.cpp index 3a27757cc..7c56e1afc 100644 --- a/src/object/rock.cpp +++ b/src/object/rock.cpp @@ -20,27 +20,40 @@ #include #include "rock.hpp" -#include "sprite/sprite.hpp" -#include "sprite/sprite_manager.hpp" #include "lisp/writer.hpp" -#include "video/drawing_context.hpp" -#include "resources.hpp" #include "object_factory.hpp" +#include "audio/sound_manager.hpp" +#include "tile.hpp" + +namespace { + const std::string ROCK_SOUND = "sounds/brick.wav"; //TODO use own sound. +} + +Rock::Rock(const Vector& pos, std::string spritename) + : MovingSprite(pos, spritename) +{ + sound_manager->preload(ROCK_SOUND); + on_ground = false; + grabbed = false; + set_group(COLGROUP_MOVING_STATIC); +} Rock::Rock(const lisp::Lisp& reader) + : MovingSprite(reader, "images/objects/rock/rock.sprite") { - reader.get("x", bbox.p1.x); - reader.get("y", bbox.p1.y); - bbox.set_size(31.8, 31.8); - sprite = sprite_manager->create("images/objects/rock/rock.sprite"); + sound_manager->preload(ROCK_SOUND); + on_ground = false; grabbed = false; - flags |= FLAG_SOLID | FLAG_PORTABLE; - set_group(COLGROUP_MOVING); + set_group(COLGROUP_MOVING_STATIC); } -Rock::~Rock() +Rock::Rock(const lisp::Lisp& reader, std::string spritename) + : MovingSprite(reader, spritename) { - delete sprite; + sound_manager->preload(ROCK_SOUND); + on_ground = false; + grabbed = false; + set_group(COLGROUP_MOVING_STATIC); } void @@ -55,42 +68,50 @@ Rock::write(lisp::Writer& writer) } void -Rock::draw(DrawingContext& context) +Rock::update(float elapsed_time) { - sprite->draw(context, get_pos(), LAYER_OBJECTS); + if( grabbed ) + return; + + if (on_ground) physic.set_velocity_x(0); + + movement = physic.get_movement(elapsed_time); } void -Rock::update(float elapsed_time) +Rock::collision_solid(const CollisionHit& hit) { - if(!grabbed) { - flags |= FLAG_SOLID; - set_group(COLGROUP_MOVING); - movement = physic.get_movement(elapsed_time); - } else { + if(grabbed) { + return; + } + if(hit.top || hit.bottom) + physic.set_velocity_y(0); + if(hit.left || hit.right) + physic.set_velocity_x(0); + if(hit.crush) physic.set_velocity(0, 0); - flags &= ~FLAG_SOLID; - set_group(COLGROUP_DISABLED); + + if(hit.bottom && !on_ground && !grabbed) { + sound_manager->play(ROCK_SOUND, get_pos()); + on_ground = true; } - - grabbed = false; - printf("%p - V %3.1f %3.1f - P %3.1f %3.1f\n", this, - physic.get_velocity().x, physic.get_velocity().y, - get_pos().x, get_pos().y); } HitResponse -Rock::collision(GameObject& object, const CollisionHit& hit) +Rock::collision(GameObject& other, const CollisionHit& hit) { if(grabbed) { - return FORCE_MOVE; + return PASSTHROUGH; } - - if(object.get_flags() & FLAG_SOLID) { - printf("%p vs %p - %3.1f %3.1f D %3.1f\n", this, &object, - hit.normal.x, hit.normal.y, hit.depth); - physic.set_velocity(0, 0); - return CONTINUE; + if(!on_ground) { + if(hit.bottom && physic.get_velocity_y() > 200) { + MovingObject* moving_object = dynamic_cast (&other); + if(moving_object) { + //Getting a rock on the head hurts. A lot. + moving_object->collision_tile(Tile::HURTS); + } + } + return FORCE_MOVE; } return FORCE_MOVE; @@ -100,8 +121,25 @@ void Rock::grab(MovingObject& , const Vector& pos, Direction) { movement = pos - get_pos(); + last_movement = movement; + set_group(COLGROUP_TOUCHABLE); + on_ground = false; grabbed = true; } -IMPLEMENT_FACTORY(Rock, "rock"); +void +Rock::ungrab(MovingObject& , Direction dir) +{ + set_group(COLGROUP_MOVING_STATIC); + on_ground = false; + if(dir == UP) { + physic.set_velocity(0, -500); + } else if (last_movement.norm() > 1) { + physic.set_velocity((dir == RIGHT) ? 200 : -200, -200); + } else { + physic.set_velocity(0, 0); + } + grabbed = false; +} +IMPLEMENT_FACTORY(Rock, "rock");