X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrtree.cpp;h=3828225050c9583fca52c69e6ba8098190306ff4;hb=788a9153f60fb3d25a52fd184387ebbde7636719;hp=565cf70906bee3ce83fc7d158aed5d096436c8c2;hpb=fd282d4799cb88eae93e471f5c055f9dc3f12b86;p=supertux.git

diff --git a/src/badguy/mrtree.cpp b/src/badguy/mrtree.cpp
index 565cf7090..382822505 100644
--- a/src/badguy/mrtree.cpp
+++ b/src/badguy/mrtree.cpp
@@ -20,11 +20,17 @@
 #include <config.h>
 
 #include "mrtree.hpp"
+
 #include "stumpy.hpp"
 #include "poisonivy.hpp"
 #include "random_generator.hpp"
 #include "object/sprite_particle.hpp"
 #include "sector.hpp"
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
+#include "audio/sound_manager.hpp"
+
+#include <math.h>
 
 static const float WALKSPEED = 100;
 
@@ -37,7 +43,7 @@ MrTree::MrTree(const lisp::Lisp& reader)
   : WalkingBadguy(reader, "images/creatures/mr_tree/mr_tree.sprite","left","right")
 {
   walk_speed = WALKSPEED;
-  max_drop_height = 0;
+  max_drop_height = 16;
   sound_manager->preload("sounds/mr_tree.ogg");
 }
 
@@ -50,7 +56,7 @@ MrTree::write(lisp::Writer& writer)
 }
 
 bool
-MrTree::collision_squished(Player& player)
+MrTree::collision_squished(GameObject& object)
 {
   // replace with Stumpy
   Vector stumpy_pos = get_pos();
@@ -62,12 +68,13 @@ MrTree::collision_squished(Player& player)
 
   // give Feedback
   sound_manager->play("sounds/mr_tree.ogg", get_pos());
-  player.bounce(*this);
-  
+  Player* player = dynamic_cast<Player*>(&object);
+  if (player) player->bounce(*this);
+
   // spawn some particles
   // TODO: provide convenience function in MovingSprite or MovingObject?
-  for (int i = 0; i < 25; i++) {
-    Vector ppos = bbox.get_middle();
+  for (int px = (int)stumpy->get_bbox().p1.x; px < (int)stumpy->get_bbox().p2.x; px+=10) {
+    Vector ppos = Vector(px, stumpy->get_bbox().p1.y-5);
     float angle = systemRandom.randf(-M_PI_2, M_PI_2);
     float velocity = systemRandom.randf(45, 90);
     float vx = sin(angle)*velocity;
@@ -80,16 +87,16 @@ MrTree::collision_squished(Player& player)
   // spawn PoisonIvy
   Vector leaf1_pos = Vector(stumpy_pos.x - POISONIVY_WIDTH - 1, stumpy_pos.y - POISONIVY_Y_OFFSET);
   Rect leaf1_bbox = Rect(leaf1_pos.x, leaf1_pos.y, leaf1_pos.x + POISONIVY_WIDTH, leaf1_pos.y + POISONIVY_HEIGHT);
-  if (Sector::current()->is_free_space(leaf1_bbox)) {
+  if (Sector::current()->is_free_of_movingstatics(leaf1_bbox, this)) {
     PoisonIvy* leaf1 = new PoisonIvy(leaf1_bbox.p1, LEFT);
     leaf1 = leaf1;
     Sector::current()->add_object(leaf1);
   }
-  
+
   // spawn PoisonIvy
   Vector leaf2_pos = Vector(stumpy_pos.x + sprite->get_current_hitbox_width() + 1, stumpy_pos.y - POISONIVY_Y_OFFSET);
   Rect leaf2_bbox = Rect(leaf2_pos.x, leaf2_pos.y, leaf2_pos.x + POISONIVY_WIDTH, leaf2_pos.y + POISONIVY_HEIGHT);
-  if (Sector::current()->is_free_space(leaf2_bbox)) {
+  if (Sector::current()->is_free_of_movingstatics(leaf2_bbox, this)) {
     PoisonIvy* leaf2 = new PoisonIvy(leaf2_bbox.p1, RIGHT);
     leaf2 = leaf2;
     Sector::current()->add_object(leaf2);
@@ -99,4 +106,3 @@ MrTree::collision_squished(Player& player)
 }
 
 IMPLEMENT_FACTORY(MrTree, "mrtree")
-