projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More -Weffc++ cleanup
[supertux.git]
/
src
/
badguy
/
jumpy.cpp
diff --git
a/src/badguy/jumpy.cpp
b/src/badguy/jumpy.cpp
index
233a672
..
ad63c49
100644
(file)
--- a/
src/badguy/jumpy.cpp
+++ b/
src/badguy/jumpy.cpp
@@
-1,12
+1,10
@@
-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// SuperTux
// 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
-//
as published by the Free Software Foundation; either version 2
-//
of the License, or
(at your option) any later version.
+// 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 3 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
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,31
+12,25
@@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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.
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include
<config.h>
+#include
"badguy/jumpy.hpp"
-#include "jumpy.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
static const float JUMPSPEED=-600;
static const float JUMPY_MID_TOLERANCE=4;
static const float JUMPY_LOW_TOLERANCE=2;
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)
- : BadGuy(reader, "images/creatures/jumpy/jumpy.sprite"), groundhit_pos_set(false)
+Jumpy::Jumpy(const Reader& reader) :
+ BadGuy(reader, "images/creatures/snowjumpy/snowjumpy.sprite"),
+ pos_groundhit(),
+ groundhit_pos_set(false)
{
{
-}
-
-void
-Jumpy::write(lisp::Writer& writer)
-{
- writer.start_list("jumpy");
-
- writer.write_float("x", start_position.x);
- writer.write_float("y", start_position.y);
-
- writer.end_list("jumpy");
+ // TODO create a nice sound for this...
+ //sound_manager->preload("sounds/skid.wav");
}
void
}
void
@@
-62,8
+54,8
@@
Jumpy::hit(const CollisionHit& chit)
pos_groundhit = get_pos();
groundhit_pos_set = true;
}
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");
} else if(chit.top) {
// TODO create a nice sound for this...
//sound_manager->play("sounds/skid.wav");
} else if(chit.top) {
@@
-77,26
+69,45
@@
void
Jumpy::active_update(float elapsed_time)
{
BadGuy::active_update(elapsed_time);
Jumpy::active_update(float elapsed_time)
{
BadGuy::active_update(elapsed_time);
-
+
+ if(frozen)
+ return;
+
Player* player = this->get_nearest_player();
if (player)
{
dir = (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)
{
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) &&
- get_pos().y < (pos_groundhit.y - JUMPY_LOW_TOLERANCE) )
+
get_pos().y < (pos_groundhit.y - JUMPY_LOW_TOLERANCE) )
sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
else
sprite->set_action(dir == LEFT ? "left-down" : "right-down");
}
sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
else
sprite->set_action(dir == LEFT ? "left-down" : "right-down");
}
-IMPLEMENT_FACTORY(Jumpy, "jumpy")
+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");
+
+/* EOF */