projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hardcoded stay-on-platform behaviour as follows: Mr. Bomb, Mr. Tree and the Totem...
[supertux.git]
/
src
/
badguy
/
mriceblock.cpp
diff --git
a/src/badguy/mriceblock.cpp
b/src/badguy/mriceblock.cpp
index
7da4bf3
..
3361f41
100644
(file)
--- a/
src/badguy/mriceblock.cpp
+++ b/
src/badguy/mriceblock.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,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
@@
MrIceBlock::MrIceBlock(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("
mriceblock
");
+ sprite = sprite_manager->create("
images/creatures/mr_iceblock/mr_iceblock.sprite
");
set_direction = false;
}
set_direction = false;
}
@@
-43,7
+42,7
@@
MrIceBlock::MrIceBlock(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("
mriceblock
");
+ sprite = sprite_manager->create("
images/creatures/mr_iceblock/mr_iceblock.sprite
");
set_direction = true;
initial_direction = d;
}
set_direction = true;
initial_direction = d;
}
@@
-79,7
+78,14
@@
MrIceBlock::active_update(float elapsed_time)
if(ice_state == ICESTATE_FLAT && flat_timer.check()) {
set_state(ICESTATE_NORMAL);
}
if(ice_state == ICESTATE_FLAT && flat_timer.check()) {
set_state(ICESTATE_NORMAL);
}
-
+
+ if (ice_state == ICESTATE_NORMAL && might_fall(601))
+ {
+ dir = (dir == LEFT ? RIGHT : LEFT);
+ sprite->set_action(dir == LEFT ? "left" : "right");
+ physic.set_velocity_x(-physic.get_velocity_x());
+ }
+
BadGuy::active_update(elapsed_time);
}
BadGuy::active_update(elapsed_time);
}
@@
-245,7
+251,7
@@
MrIceBlock::set_state(IceState state)
physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED);
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
// we should slide above 1 block holes now...
physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED);
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
// we should slide above 1 block holes now...
- bbox.set_size(3
2.5
, 31.8);
+ bbox.set_size(3
4
, 31.8);
break;
case ICESTATE_GRABBED:
flat_timer.stop();
break;
case ICESTATE_GRABBED:
flat_timer.stop();