-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
-// 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
// 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 <http://www.gnu.org/licenses/>.
-#include <config.h>
+#include "badguy/mrtree.hpp"
-#include "mrtree.hpp"
-#include "stumpy.hpp"
-#include "poisonivy.hpp"
-#include "random_generator.hpp"
+#include "audio/sound_manager.hpp"
+#include "badguy/poisonivy.hpp"
+#include "badguy/stumpy.hpp"
+#include "math/random_generator.hpp"
+#include "object/player.hpp"
#include "object/sprite_particle.hpp"
-#include "sector.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+
+#include <math.h>
static const float WALKSPEED = 100;
static const float POISONIVY_HEIGHT = 32;
static const float POISONIVY_Y_OFFSET = 24;
-
-MrTree::MrTree(const lisp::Lisp& reader)
+MrTree::MrTree(const Reader& 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");
}
-void
-MrTree::write(lisp::Writer& writer)
-{
- writer.start_list("mrtree");
- WalkingBadguy::write(writer);
- writer.end_list("mrtree");
-}
-
bool
-MrTree::collision_squished(Player& player)
+MrTree::collision_squished(GameObject& object)
{
// replace with Stumpy
Vector stumpy_pos = get_pos();
// 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 px = (int)stumpy->get_bbox().p1.x; px < (int)stumpy->get_bbox().p2.x; px+=10) {
// 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;
+ leaf1->countMe = false;
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;
+ leaf2->countMe = false;
Sector::current()->add_object(leaf2);
}
return true;
}
-IMPLEMENT_FACTORY(MrTree, "mrtree")
-
+IMPLEMENT_FACTORY(MrTree, "mrtree");
+
+/* EOF */