projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use svnversion program rather than finding the svn package to get revision number
[supertux.git]
/
src
/
badguy
/
jumpy.cpp
diff --git
a/src/badguy/jumpy.cpp
b/src/badguy/jumpy.cpp
index
7958c5e
..
20b3f51
100644
(file)
--- a/
src/badguy/jumpy.cpp
+++ b/
src/badguy/jumpy.cpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
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
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,26
+12,24
@@
// 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.
// 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
// 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 <config.h>
-#include "jumpy.h"
+#include "jumpy.h
pp
"
-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)
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/snowjumpy/snowjumpy.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");
+ // TODO create a nice sound for this...
+ //sound_manager->preload("sounds/skid.wav");
}
void
}
void
@@
-45,10
+43,10
@@
Jumpy::write(lisp::Writer& writer)
writer.end_list("jumpy");
}
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
@@
-60,18
+58,17
@@
Jumpy::collision_badguy(BadGuy& , const CollisionHit& chit)
HitResponse
Jumpy::hit(const CollisionHit& chit)
{
HitResponse
Jumpy::hit(const CollisionHit& chit)
{
- // hit floor?
- if(chit.normal.y < -.5) {
+ if(chit.bottom) {
if (!groundhit_pos_set)
{
pos_groundhit = get_pos();
groundhit_pos_set = true;
}
if (!groundhit_pos_set)
{
pos_groundhit = get_pos();
groundhit_pos_set = true;
}
-
- physic.set_velocity_y(JUMPSPEED);
+
+ physic.set_velocity_y(
(frozen || get_state() == STATE_FALLING) ? 0 :
JUMPSPEED);
// TODO create a nice sound for this...
//sound_manager->play("sounds/skid.wav");
// TODO create a nice sound for this...
//sound_manager->play("sounds/skid.wav");
- } else if(chit.
normal.y < .5) { // bumped on roof
+ } else if(chit.
top) {
physic.set_velocity_y(0);
}
physic.set_velocity_y(0);
}
@@
-82,16
+79,22
@@
void
Jumpy::active_update(float elapsed_time)
{
BadGuy::active_update(elapsed_time);
Jumpy::active_update(float elapsed_time)
{
BadGuy::active_update(elapsed_time);
-
- dir = Sector::current()->player->get_pos().x > get_pos().x
- ? RIGHT : LEFT;
-
+
+ if(frozen)
+ return;
+
+ Player* player = this->get_nearest_player();
+ if (player)
+ {
+ dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
+ }
+
if (!groundhit_pos_set)
{
sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
return;
}
if (!groundhit_pos_set)
{
sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
return;
}
-
+
if ( get_pos().y < (pos_groundhit.y - JUMPY_MID_TOLERANCE ) )
sprite->set_action(dir == LEFT ? "left-up" : "right-up");
else if ( get_pos().y >= (pos_groundhit.y - JUMPY_MID_TOLERANCE) &&
if ( get_pos().y < (pos_groundhit.y - JUMPY_MID_TOLERANCE ) )
sprite->set_action(dir == LEFT ? "left-up" : "right-up");
else if ( get_pos().y >= (pos_groundhit.y - JUMPY_MID_TOLERANCE) &&
@@
-101,4
+104,18
@@
Jumpy::active_update(float elapsed_time)
sprite->set_action(dir == LEFT ? "left-down" : "right-down");
}
sprite->set_action(dir == LEFT ? "left-down" : "right-down");
}
+void
+Jumpy::freeze()
+{
+ BadGuy::freeze();
+ physic.set_velocity_y(std::max(0.0f, physic.get_velocity_y()));
+ sprite->set_action(dir == LEFT ? "left-iced" : "right-iced");
+}
+
+bool
+Jumpy::is_freezable() const
+{
+ return true;
+}
+
IMPLEMENT_FACTORY(Jumpy, "jumpy")
IMPLEMENT_FACTORY(Jumpy, "jumpy")