projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set 'licence' attribute on sound files
[supertux.git]
/
src
/
badguy
/
mrtree.cpp
diff --git
a/src/badguy/mrtree.cpp
b/src/badguy/mrtree.cpp
index
bf79234
..
3828225
100644
(file)
--- a/
src/badguy/mrtree.cpp
+++ b/
src/badguy/mrtree.cpp
@@
-20,11
+20,17
@@
#include <config.h>
#include "mrtree.hpp"
#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 "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;
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;
: 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");
}
sound_manager->preload("sounds/mr_tree.ogg");
}
@@
-50,7
+56,7
@@
MrTree::write(lisp::Writer& writer)
}
bool
}
bool
-MrTree::collision_squished(
Player& player
)
+MrTree::collision_squished(
GameObject& object
)
{
// replace with Stumpy
Vector stumpy_pos = get_pos();
{
// replace with Stumpy
Vector stumpy_pos = get_pos();
@@
-62,7
+68,8
@@
MrTree::collision_squished(Player& player)
// give Feedback
sound_manager->play("sounds/mr_tree.ogg", 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?
// spawn some particles
// TODO: provide convenience function in MovingSprite or MovingObject?