projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Massive copyright update. I'm sorry if I'm crediting Matze for something he didn...
[supertux.git]
/
src
/
badguy
/
snowsnail.cpp
diff --git
a/src/badguy/snowsnail.cpp
b/src/badguy/snowsnail.cpp
index
e3a8664
..
6799885
100644
(file)
--- a/
src/badguy/snowsnail.cpp
+++ b/
src/badguy/snowsnail.cpp
@@
-1,7
+1,7
@@
-// $Id
: snowsnail.cpp 2738 2005-10-08 08:53:46Z wansti
$
-//
+// $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,11
+12,10
@@
// 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>
@@
-33,7
+32,7
@@
SnowSnail::SnowSnail(const lisp::Lisp& reader)
reader.get("x", start_position.x);
reader.get("y", start_position.y);
bbox.set_size(31.8, 31.8);
reader.get("x", start_position.x);
reader.get("y", start_position.y);
bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("
snowsnail
");
+ sprite = sprite_manager->create("
images/creatures/snowsnail/snowsnail.sprite
");
set_direction = false;
}
set_direction = false;
}
@@
-43,7
+42,7
@@
SnowSnail::SnowSnail(float pos_x, float pos_y, Direction d)
start_position.x = pos_x;
start_position.y = pos_y;
bbox.set_size(31.8, 31.8);
start_position.x = pos_x;
start_position.y = pos_y;
bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("
snowsnail
");
+ sprite = sprite_manager->create("
images/creatures/snowsnail/snowsnail.sprite
");
set_direction = true;
initial_direction = d;
}
set_direction = true;
initial_direction = d;
}
@@
-70,6
+69,9
@@
SnowSnail::activate()
void
SnowSnail::active_update(float elapsed_time)
{
void
SnowSnail::active_update(float elapsed_time)
{
+ if((ice_state != ICESTATE_KICKED) && flat_timer.started()) {
+ sprite->set_fps(64 - 15 * flat_timer.get_timegone());
+ }
if(ice_state == ICESTATE_FLAT && flat_timer.check()) {
ice_state = ICESTATE_NORMAL;
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
if(ice_state == ICESTATE_FLAT && flat_timer.check()) {
ice_state = ICESTATE_NORMAL;
physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
@@
-104,6
+106,7
@@
SnowSnail::collision_solid(GameObject& object, const CollisionHit& hit)
dir = dir == LEFT ? RIGHT : LEFT;
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
dir = dir == LEFT ? RIGHT : LEFT;
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
+ sprite->set_fps(64);
physic.set_velocity_x(-physic.get_velocity_x());
sound_manager->play("sounds/iceblock_bump.wav", get_pos());
break;
physic.set_velocity_x(-physic.get_velocity_x());
sound_manager->play("sounds/iceblock_bump.wav", get_pos());
break;
@@
-157,6
+160,7
@@
SnowSnail::collision_squished(Player& player)
physic.set_velocity_y(0);
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
physic.set_velocity_y(0);
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
+ sprite->set_fps(64);
flat_timer.start(4);
ice_state = ICESTATE_FLAT;
break;
flat_timer.start(4);
ice_state = ICESTATE_FLAT;
break;
@@
-171,6
+175,7
@@
SnowSnail::collision_squished(Player& player)
}
physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED);
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
}
physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED);
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
+ sprite->set_fps(64);
ice_state = ICESTATE_KICKED;
break;
}
ice_state = ICESTATE_KICKED;
break;
}