// $Id$
-//
+//
// SuperTux
-// Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+// Copyright (C) 2006 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
// 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.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
#include <config.h>
-#include "jumpy.h"
+#include "jumpy.hpp"
-static const float JUMPSPEED=600;
+static const float JUMPSPEED=-600;
static const float JUMPY_MID_TOLERANCE=4;
static const float JUMPY_LOW_TOLERANCE=2;
Jumpy::Jumpy(const lisp::Lisp& reader)
- : groundhit_pos_set(false)
+ : BadGuy(reader, "images/creatures/jumpy/jumpy.sprite"), groundhit_pos_set(false)
{
- reader.get("x", start_position.x);
- reader.get("y", start_position.y);
- bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("jumpy");
}
void
writer.end_list("jumpy");
}
-HitResponse
-Jumpy::collision_solid(GameObject& , const CollisionHit& chit)
+void
+Jumpy::collision_solid(const CollisionHit& chit)
{
- return hit(chit);
+ hit(chit);
}
HitResponse
HitResponse
Jumpy::hit(const CollisionHit& chit)
{
- // hit floor?
- if(chit.normal.y < -.5) {
+ if(chit.bottom) {
if (!groundhit_pos_set)
{
pos_groundhit = get_pos();
physic.set_velocity_y(JUMPSPEED);
// TODO create a nice sound for this...
- //sound_manager->play("skid");
- } else if(chit.normal.y < .5) { // bumped on roof
+ //sound_manager->play("sounds/skid.wav");
+ } else if(chit.top) {
physic.set_velocity_y(0);
}
{
BadGuy::active_update(elapsed_time);
- dir = Sector::current()->player->get_pos().x > get_pos().x
- ? RIGHT : LEFT;
+ Player* player = this->get_nearest_player();
+ if (player)
+ {
+ dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
+ }
if (!groundhit_pos_set)
{