X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Ftotem.cpp;h=b20991496f14c11736b5f5ee9df60bbaae5f944d;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=7d2b932a1f02620294a1988cf662aec8009505ee;hpb=58eb3364f724b2100859fd39da9bba5a9a09cafc;p=supertux.git

diff --git a/src/badguy/totem.cpp b/src/badguy/totem.cpp
index 7d2b932a1..b20991496 100644
--- a/src/badguy/totem.cpp
+++ b/src/badguy/totem.cpp
@@ -24,23 +24,22 @@
 #include "log.hpp"
 
 static const float WALKSPEED = 100;
-static const float JUMP_ON_SPEED_Y = 400;
-static const float JUMP_OFF_SPEED_Y = 500;
+static const float JUMP_ON_SPEED_Y = -400;
+static const float JUMP_OFF_SPEED_Y = -500;
+static const std::string LAND_ON_TOTEM_SOUND = "sounds/totem.ogg";
 
 Totem::Totem(const lisp::Lisp& reader)
+	: BadGuy(reader, "images/creatures/totem/totem.sprite")
 {
   carrying = 0;
   carried_by = 0;
-
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  sprite = sprite_manager->create("images/creatures/totem/totem.sprite");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
+  sound_manager->preload( LAND_ON_TOTEM_SOUND );
 }
 
 Totem::Totem(const Totem& other)
 	: BadGuy(other), carrying(other.carrying), carried_by(other.carried_by)
 {
+  sound_manager->preload( LAND_ON_TOTEM_SOUND );
 }
 
 Totem::~Totem() 
@@ -94,7 +93,7 @@ Totem::active_update(float elapsed_time)
   BadGuy::active_update(elapsed_time);
 
   if (!carried_by) {
-    if (might_fall())
+    if (on_ground() && might_fall())
     {
       dir = (dir == LEFT ? RIGHT : LEFT);
       activate();
@@ -155,31 +154,31 @@ Totem::collision_squished(Player& player)
   return true;
 }
 
-HitResponse
-Totem::collision_solid(GameObject& object, const CollisionHit& hit)
+void
+Totem::collision_solid(const CollisionHit& hit)
 {
+  update_on_ground_flag(hit);
+
   // if we are being carried around, pass event to bottom of stack and ignore it
   if (carried_by) {
-    carried_by->collision_solid(object, hit);
-    return CONTINUE;
+    carried_by->collision_solid(hit);
+    return;
   }
 
   // If we hit something from above or below: stop moving in this direction 
-  if (hit.normal.y != 0) {
+  if (hit.top || hit.bottom) {
     physic.set_velocity_y(0);
   }
 
   // If we are hit from the direction we are facing: turn around
-  if ((hit.normal.x > .8) && (dir == LEFT)) {
+  if (hit.left && (dir == LEFT)) {
     dir = RIGHT;
     activate();
   }
-  if ((hit.normal.x < -.8) && (dir == RIGHT)) {
+  if (hit.right && (dir == RIGHT)) {
     dir = LEFT;
     activate();
   }
-
-  return CONTINUE;
 }
 
 HitResponse
@@ -203,11 +202,11 @@ Totem::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
   }
 
   // If we are hit from the direction we are facing: turn around
-  if ((hit.normal.x > .8) && (dir == LEFT)) {
+  if(hit.left && (dir == LEFT)) {
     dir = RIGHT;
     activate();
   }
-  if ((hit.normal.x < -.8) && (dir == RIGHT)) {
+  if(hit.right && (dir == RIGHT)) {
     dir = LEFT;
     activate();
   }
@@ -237,6 +236,9 @@ Totem::jump_on(Totem* target)
   this->carried_by = target;
   this->activate();
   bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
+ 
+  sound_manager->play( LAND_ON_TOTEM_SOUND , get_pos());
+
   
   this->synchronize_with(target);
 }