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
d79641a
..
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>
@@
-32,19
+31,16
@@
MrIceBlock::MrIceBlock(const lisp::Lisp& reader)
{
reader.get("x", start_position.x);
reader.get("y", start_position.y);
{
reader.get("x", start_position.x);
reader.get("y", start_position.y);
- stay_on_platform = false;
- reader.get("stay-on-platform", stay_on_platform);
bbox.set_size(31.8, 31.8);
sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite");
set_direction = false;
}
bbox.set_size(31.8, 31.8);
sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite");
set_direction = false;
}
-MrIceBlock::MrIceBlock(float pos_x, float pos_y, Direction d
, bool stay_on_plat = false
)
+MrIceBlock::MrIceBlock(float pos_x, float pos_y, Direction d)
: ice_state(ICESTATE_NORMAL), squishcount(0)
{
start_position.x = pos_x;
start_position.y = pos_y;
: ice_state(ICESTATE_NORMAL), squishcount(0)
{
start_position.x = pos_x;
start_position.y = pos_y;
- stay_on_platform = stay_on_plat;
bbox.set_size(31.8, 31.8);
sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite");
set_direction = true;
bbox.set_size(31.8, 31.8);
sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite");
set_direction = true;
@@
-58,7
+54,6
@@
MrIceBlock::write(lisp::Writer& writer)
writer.write_float("x", start_position.x);
writer.write_float("y", start_position.y);
writer.write_float("x", start_position.x);
writer.write_float("y", start_position.y);
- writer.write_bool("stay-on-platform", stay_on_platform);
writer.end_list("mriceblock");
}
writer.end_list("mriceblock");
}
@@
-84,9
+79,7
@@
MrIceBlock::active_update(float elapsed_time)
set_state(ICESTATE_NORMAL);
}
set_state(ICESTATE_NORMAL);
}
- if (ice_state == ICESTATE_NORMAL &&
- stay_on_platform &&
- may_fall_off_platform())
+ if (ice_state == ICESTATE_NORMAL && might_fall(601))
{
dir = (dir == LEFT ? RIGHT : LEFT);
sprite->set_action(dir == LEFT ? "left" : "right");
{
dir = (dir == LEFT ? RIGHT : LEFT);
sprite->set_action(dir == LEFT ? "left" : "right");
@@
-277,7
+270,6
@@
MrIceBlock::grab(MovingObject&, const Vector& pos, Direction dir)
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
set_state(ICESTATE_GRABBED);
set_group(COLGROUP_DISABLED);
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
set_state(ICESTATE_GRABBED);
set_group(COLGROUP_DISABLED);
- remove_out_of_bounds = false;
}
void
}
void
@@
-286,7
+278,6
@@
MrIceBlock::ungrab(MovingObject& , Direction dir)
this->dir = dir;
set_state(ICESTATE_KICKED);
set_group(COLGROUP_MOVING);
this->dir = dir;
set_state(ICESTATE_KICKED);
set_group(COLGROUP_MOVING);
- remove_out_of_bounds = true;
}
IMPLEMENT_FACTORY(MrIceBlock, "mriceblock")
}
IMPLEMENT_FACTORY(MrIceBlock, "mriceblock")