-// $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 TREE_SPEED = 100;
static const float POISONIVY_WIDTH = 32;
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;
+ walk_speed = TREE_SPEED;
max_drop_height = 16;
- sound_manager->preload("sounds/mr_tree.ogg");
+ SoundManager::current()->preload("sounds/mr_tree.ogg");
}
-void
-MrTree::write(lisp::Writer& writer)
+bool
+MrTree::is_freezable() const
{
- writer.start_list("mrtree");
- WalkingBadguy::write(writer);
- writer.end_list("mrtree");
+ return true;
}
bool
Vector stumpy_pos = get_pos();
stumpy_pos.x += 20;
stumpy_pos.y += 25;
- Stumpy* stumpy = new Stumpy(stumpy_pos, dir);
+ auto stumpy = std::make_shared<Stumpy>(stumpy_pos, dir);
remove_me();
Sector::current()->add_object(stumpy);
// give Feedback
- sound_manager->play("sounds/mr_tree.ogg", get_pos());
+ SoundManager::current()->play("sounds/mr_tree.ogg", get_pos());
Player* player = dynamic_cast<Player*>(&object);
if (player) player->bounce(*this);
// 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) {
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 angle = graphicsRandom.randf(-M_PI_2, M_PI_2);
+ float velocity = graphicsRandom.randf(45, 90);
float vx = sin(angle)*velocity;
float vy = -cos(angle)*velocity;
Vector pspeed = Vector(vx, vy);
Vector paccel = Vector(0, 100);
- Sector::current()->add_object(new SpriteParticle("images/objects/particles/leaf.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
+ Sector::current()->add_object(std::make_shared<SpriteParticle>("images/objects/particles/leaf.sprite",
+ "default",
+ ppos, ANCHOR_MIDDLE,
+ pspeed, paccel,
+ LAYER_OBJECTS-1));
}
// 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);
+ Vector leaf1_pos(stumpy_pos.x - POISONIVY_WIDTH - 1, stumpy_pos.y - POISONIVY_Y_OFFSET);
+ Rectf leaf1_bbox(leaf1_pos.x, leaf1_pos.y, leaf1_pos.x + POISONIVY_WIDTH, leaf1_pos.y + POISONIVY_HEIGHT);
if (Sector::current()->is_free_of_movingstatics(leaf1_bbox, this)) {
- PoisonIvy* leaf1 = new PoisonIvy(leaf1_bbox.p1, LEFT);
- leaf1 = leaf1;
+ auto leaf1 = std::make_shared<PoisonIvy>(leaf1_bbox.p1, LEFT);
+ 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);
+ Vector leaf2_pos(stumpy_pos.x + sprite->get_current_hitbox_width() + 1, stumpy_pos.y - POISONIVY_Y_OFFSET);
+ Rectf leaf2_bbox(leaf2_pos.x, leaf2_pos.y, leaf2_pos.x + POISONIVY_WIDTH, leaf2_pos.y + POISONIVY_HEIGHT);
if (Sector::current()->is_free_of_movingstatics(leaf2_bbox, this)) {
- PoisonIvy* leaf2 = new PoisonIvy(leaf2_bbox.p1, RIGHT);
- leaf2 = leaf2;
+ auto leaf2 = std::make_shared<PoisonIvy>(leaf2_bbox.p1, RIGHT);
+ leaf2->countMe = false;
Sector::current()->add_object(leaf2);
}
return true;
}
-IMPLEMENT_FACTORY(MrTree, "mrtree")
+/* EOF */