Made badguys face right when spawning onscreen and to the left of the

[supertux.git] / src / badguy / totem.cpp

diff --git a/src/badguy/totem.cpp b/src/badguy/totem.cpp
index c61ab9a..825ed81 100644 (file)
--- a/src/badguy/totem.cpp
+++ b/src/badguy/totem.cpp
@@ -24,18 +24,19 @@
 #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;
 
 Totem::Totem(const lisp::Lisp& reader)
+       : BadGuy(reader, "images/creatures/totem/totem.sprite")
 {
   carrying = 0;
   carried_by = 0;
-  bbox.set_size(48, 49);
+}
 
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  sprite = sprite_manager->create("images/creatures/totem/totem.sprite");
+Totem::Totem(const Totem& other)
+       : BadGuy(other), carrying(other.carrying), carried_by(other.carried_by)
+{
 }
 
 Totem::~Totem() 
@@ -44,6 +45,20 @@ Totem::~Totem()
   if (carried_by) jump_off();
 }
 
+bool 
+Totem::updatePointers(const GameObject* from_object, GameObject* to_object)
+{
+  if (from_object == carrying) {
+    carrying = dynamic_cast<Totem*>(to_object);
+    return true;
+  }
+  if (from_object == carried_by) {
+    carried_by = dynamic_cast<Totem*>(to_object);
+    return true;
+  }
+  return false;
+}
+
 void
 Totem::write(lisp::Writer& writer)
 {
@@ -75,7 +90,7 @@ Totem::active_update(float elapsed_time)
   BadGuy::active_update(elapsed_time);
 
   if (!carried_by) {
-    if (may_fall_off_platform())
+    if (might_fall())
     {
       dir = (dir == LEFT ? RIGHT : LEFT);
       activate();
@@ -130,7 +145,8 @@ Totem::collision_squished(Player& player)
   }
 
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
-  this->bbox.set_size(48, 45);
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
+
   kill_squished(player);
   return true;
 }
@@ -215,8 +231,8 @@ Totem::jump_on(Totem* target)
   target->carrying = this;
 
   this->carried_by = target;
-  this->bbox.set_size(48, 45);
   this->activate();
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
   
   this->synchronize_with(target);
 }
@@ -231,9 +247,10 @@ Totem::jump_off() {
   carried_by->carrying = 0;
 
   this->carried_by = 0;
-  this->bbox.set_size(48, 49);
 
   this->activate();
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
+
 
   physic.set_velocity_y(JUMP_OFF_SPEED_Y);
 }
@@ -248,7 +265,7 @@ Totem::synchronize_with(Totem* base)
   }
   
   Vector pos = base->get_pos();
-  pos.y -= 45;
+  pos.y -= sprite->get_current_hitbox_height();
   set_pos(pos);
 
   physic.set_velocity_x(base->physic.get_velocity_x());