fix collision against spikes too wide, fix paths, try to fix jumping on badguys that...

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

diff --git a/src/badguy/mrtree.cpp b/src/badguy/mrtree.cpp
index efe080d..bcd4363 100644 (file)
--- a/src/badguy/mrtree.cpp
+++ b/src/badguy/mrtree.cpp
@@ -1,16 +1,41 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  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.
+
 #include <config.h>
 
-#include "mrtree.h"
+#include "mrtree.hpp"
+#include "poisonivy.hpp"
 
-static const float WALKSPEED = 50;
+static const float WALKSPEED = 100;
+static const float WALKSPEED_SMALL = 120;
+static const float INVINCIBLE_TIME = 1;
 
 MrTree::MrTree(const lisp::Lisp& reader)
   : mystate(STATE_BIG)
 {
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
-  bbox.set_size(84.8, 95.8);
-  sprite = sprite_manager->create("mrtree");
+  stay_on_platform = false;
+  reader.get("stay-on-platform", stay_on_platform);
+  bbox.set_size(84.8, 84.8);
+  sprite = sprite_manager->create("images/creatures/mr_tree/mr_tree.sprite");
 }
 
 void
@@ -27,28 +52,89 @@ MrTree::write(lisp::Writer& writer)
 void
 MrTree::activate()
 {
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  if(mystate == STATE_BIG)
-    sprite->set_action(dir == LEFT ? "left" : "right");
-  else
+  if (mystate == STATE_BIG) {
+    physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
+    sprite->set_action(dir == LEFT ? "large-left" : "large-right");
+    return;
+  }
+  if (mystate == STATE_INVINCIBLE) {
+    physic.set_velocity_x(0);
+    sprite->set_action(dir == LEFT ? "small-left" : "small-right");
+    return;
+  }
+  if (mystate == STATE_NORMAL) {
+    physic.set_velocity_x(dir == LEFT ? -WALKSPEED_SMALL : WALKSPEED_SMALL);
     sprite->set_action(dir == LEFT ? "small-left" : "small-right");
+    return;
+  }
+}
+
+void
+MrTree::active_update(float elapsed_time)
+{
+  if ((mystate == STATE_INVINCIBLE) && (invincible_timer.check())) {
+    mystate = STATE_NORMAL;
+    activate();
+  }
+
+  if (stay_on_platform && may_fall_off_platform())
+  {
+    dir = (dir == LEFT ? RIGHT : LEFT);
+    activate();
+  }
+
+  BadGuy::active_update(elapsed_time);
 }
 
 bool
 MrTree::collision_squished(Player& player)
 {
+  // if we're big, we shrink
   if(mystate == STATE_BIG) {
-    mystate = STATE_NORMAL;
+    mystate = STATE_INVINCIBLE;
+    invincible_timer.start(INVINCIBLE_TIME);
     activate();
 
-    SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(),
-            player.get_pos());      
+    // shrink bounding box and adjust sprite position to where the stump once was
+    bbox.set_size(42, 62);
+    Vector pos = get_pos();
+    pos.x += 20;
+    pos.y += 23;
+    set_pos(pos);
+
+    sound_manager->play("sounds/mr_tree.ogg", get_pos());
     player.bounce(*this);
-  } else {
+
+    Rect leaf1_bbox = Rect(pos.x-32-1, pos.y-23+1, pos.x-32-1+32, pos.y-23+1+32);
+    if (Sector::current()->is_free_space(leaf1_bbox)) {
+      PoisonIvy* leaf1 = new PoisonIvy(leaf1_bbox.p1.x, leaf1_bbox.p1.y, LEFT);
+      Sector::current()->add_object(leaf1);
+    }
+    Rect leaf2_bbox = Rect(pos.x+42+1, pos.y-23+1, pos.x+32+1+32, pos.y-23+1+32);
+    if (Sector::current()->is_free_space(leaf2_bbox)) {
+      PoisonIvy* leaf2 = new PoisonIvy(leaf2_bbox.p1.x, leaf2_bbox.p1.y, RIGHT);
+      Sector::current()->add_object(leaf2);
+    }
+
+    return true;
+  }
+
+  // if we're still invincible, we ignore the hit
+  if (mystate == STATE_INVINCIBLE) {
+    sound_manager->play("sounds/mr_treehit.ogg", get_pos());
+    player.bounce(*this);
+    return true;
+  }
+
+  // if we're small, we die
+  if (mystate == STATE_NORMAL) {
     sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
+    bbox.set_size(42, 42);
     kill_squished(player);
+    return true;
   }
-  
+
+  //TODO: exception?
   return true;
 }