[Super-tux-commit] supertux/src/badguy mrtree.cpp,NONE,1.1 mrtree.h,NONE,1.1 nolok_01.cpp,1.10,1.11

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/src/badguy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30006/src/badguy

Modified Files:
	nolok_01.cpp 
Added Files:
	mrtree.cpp mrtree.h 
Log Message:
added settras MrTree

Index: nolok_01.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- nolok_01.cpp	30 Dec 2004 11:29:52 -0000	1.10
+++ nolok_01.cpp	30 Dec 2004 14:39:08 -0000	1.11
@@ -32,12 +32,12 @@
 void
 Nolok_01::write(lisp::Writer& writer)
 {
-  writer.start_list("nolok01");
+  writer.start_list("nolok_01");
 
   writer.write_float("x", start_position.x);
   writer.write_float("y", start_position.y);
 
-  writer.end_list("nolok01");
+  writer.end_list("nolok_01");
 }
 
 void

--- NEW FILE: mrtree.cpp ---
#include <config.h>

#include "mrtree.h"

static const float WALKSPEED = 50;

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");
}

void
MrTree::write(lisp::Writer& writer)
{
  writer.start_list("mrtree");

  writer.write_float("x", start_position.x);
  writer.write_float("y", start_position.y);

  writer.end_list("mrtree");
}

void
MrTree::activate()
{
  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
  if(mystate == STATE_BIG)
    sprite->set_action(dir == LEFT ? "left" : "right");
  else
    sprite->set_action(dir == LEFT ? "small-left" : "small-right");
}

bool
MrTree::collision_squished(Player& player)
{
  if(mystate == STATE_BIG) {
    mystate = STATE_NORMAL;
    activate();

    SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(),
            player.get_pos());      
    player.bounce(*this);
  } else {
    sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
    kill_squished(player);
  }
  
  return true;
}

HitResponse
MrTree::collision_solid(GameObject& , const CollisionHit& hit)
{
  if(fabsf(hit.normal.y) > .5) {
    physic.set_velocity_y(0);
  } else {
    dir = dir == LEFT ? RIGHT : LEFT;
    activate();
  }

  return CONTINUE;
}

HitResponse
MrTree::collision_badguy(BadGuy& , const CollisionHit& hit)
{
  if(fabsf(hit.normal.x) > .8) { // left or right hit
    dir = dir == LEFT ? RIGHT : LEFT;
    activate();
  }

  return CONTINUE;
}

IMPLEMENT_FACTORY(MrTree, "mrtree")
  

--- NEW FILE: mrtree.h ---
#ifndef __MRTREE_H__
#define __MRTREE_H__

#include "badguy.h"

class MrTree : public BadGuy
{
public:
  MrTree(const lisp::Lisp& reader);

  void activate();
  void write(lisp::Writer& writer);
  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);

protected:
  enum MyState {
    STATE_BIG, STATE_NORMAL
  };
  MyState mystate;
  
  bool collision_squished(Player& player);
};

#endif