X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.cpp;h=8d771a4ce72ecc12568233c6be789cbcc7e9dec3;hb=f9cb55ad4e8ff6e6ec974f8aa1eb53c19c95c1b1;hp=3cc8a3c6160375a33d2118648a4a07f5b70a7d72;hpb=9fb702e68a4b3bd96645dc715f565e117ae953d5;p=supertux.git

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 3cc8a3c61..8d771a4ce 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -20,6 +20,7 @@
 #include "audio/sound_manager.hpp"
 #include "badguy/badguy.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
+#include "control/haptic_manager.hpp"
 #include "math/random_generator.hpp"
 #include "object/bullet.hpp"
 #include "object/camera.hpp"
@@ -1173,7 +1174,11 @@ Player::collision_solid(const CollisionHit& hit)
                                       90-40, 90-20,
                                       Vector(280, -260), Vector(0, 300), 3, Color(.4f, .4f, .4f), 3, .8f,
                                       LAYER_OBJECTS+1));
+
       Sector::current()->camera->shake(.1f, 0, 5);
+
+      if (g_haptic_manager != NULL)
+        g_haptic_manager->playEffect (ST_HAPTIC_EFFECT_BUTTJUMP);
     }
 
   } else if(hit.top) {