// 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 "jumpy.h"
+#include "jumpy.hpp"
static const float JUMPSPEED=600;
-static const float JUMPY_MID_TOLERANCE=8;
+static const float JUMPY_MID_TOLERANCE=4;
static const float JUMPY_LOW_TOLERANCE=2;
Jumpy::Jumpy(const lisp::Lisp& reader)
+ : groundhit_pos_set(false)
{
reader.get("x", start_position.x);
reader.get("y", start_position.y);
{
// hit floor?
if(chit.normal.y < -.5) {
+ if (!groundhit_pos_set)
+ {
+ pos_groundhit = get_pos();
+ groundhit_pos_set = true;
+ }
+
physic.set_velocity_y(JUMPSPEED);
// TODO create a nice sound for this...
- //sound_manager->play_sound("skid");
+ //sound_manager->play("sounds/skid.ogg");
} else if(chit.normal.y < .5) { // bumped on roof
physic.set_velocity_y(0);
}
}
void
-Jumpy::active_action(float elapsed_time)
+Jumpy::active_update(float elapsed_time)
{
- BadGuy::active_action(elapsed_time);
+ BadGuy::active_update(elapsed_time);
dir = Sector::current()->player->get_pos().x > get_pos().x
? RIGHT : LEFT;
- //FIXME: add middle and up here
+
+ if (!groundhit_pos_set)
+ {
+ sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
+ return;
+ }
- if ( get_pos().y >= (start_position.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) &&
+ get_pos().y < (pos_groundhit.y - JUMPY_LOW_TOLERANCE) )
sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
- else if ( get_pos().y >= (start_position.y - JUMPY_LOW_TOLERANCE) )
- sprite->set_action(dir == LEFT ? "left-down" : "right-down");
else
- sprite->set_action(dir == LEFT ? "left-up" : "right-up");
+ sprite->set_action(dir == LEFT ? "left-down" : "right-down");
}
IMPLEMENT_FACTORY(Jumpy, "jumpy")