projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mr Bomb turns arround again when colliding with other badguys.
[supertux.git]
/
src
/
badguy
/
angrystone.cpp
diff --git
a/src/badguy/angrystone.cpp
b/src/badguy/angrystone.cpp
index
a3eb781
..
bcf6d90
100644
(file)
--- a/
src/badguy/angrystone.cpp
+++ b/
src/badguy/angrystone.cpp
@@
-1,5
+1,5
@@
-// $Id
: angrystone.cpp 2979 2006-01-10 00:00:04Z matzebraun
$
-//
+// $Id$
+//
// AngryStone - A spiked block that charges towards the player
// Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
//
// AngryStone - A spiked block that charges towards the player
// Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
//
@@
-12,7
+12,7
@@
// 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
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 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
@@
-29,12
+29,8
@@
static const float ATTACK_TIME = 1;
static const float RECOVER_TIME = .5;
AngryStone::AngryStone(const lisp::Lisp& reader)
static const float RECOVER_TIME = .5;
AngryStone::AngryStone(const lisp::Lisp& reader)
+ : BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), state(IDLE)
{
{
- reader.get("x", start_position.x);
- reader.get("y", start_position.y);
- bbox.set_size(87.8, 87.8); // sprite is (88px, 88px)
- sprite = sprite_manager->create("images/creatures/angrystone/angrystone.sprite");
- state = IDLE;
}
void
}
void
@@
-57,10
+53,14
@@
AngryStone::activate()
sprite->set_action("idle");
}
sprite->set_action("idle");
}
-HitResponse
-AngryStone::collision_solid(
GameObject& ,
const CollisionHit& hit)
+void
+AngryStone::collision_solid(const CollisionHit& hit)
{
{
- if ((state == ATTACKING) && (hit.normal.x == -attackDirection.x) && (hit.normal.y == attackDirection.y)) {
+ // TODO
+ (void) hit;
+#if 0
+ if ((state == ATTACKING) &&
+ (hit.normal.x == -attackDirection.x) && (hit.normal.y == attackDirection.y)) {
state = IDLE;
sprite->set_action("idle");
physic.set_velocity_x(0);
state = IDLE;
sprite->set_action("idle");
physic.set_velocity_x(0);
@@
-69,8
+69,7
@@
AngryStone::collision_solid(GameObject& , const CollisionHit& hit)
oldWallDirection.x = attackDirection.x;
oldWallDirection.y = attackDirection.y;
}
oldWallDirection.x = attackDirection.x;
oldWallDirection.y = attackDirection.y;
}
-
- return CONTINUE;
+#endif
}
void
}
void
@@
-95,7
+94,7
@@
AngryStone::active_update(float elapsed_time) {
BadGuy::active_update(elapsed_time);
if (state == IDLE) {
BadGuy::active_update(elapsed_time);
if (state == IDLE) {
- MovingObject* player =
Sector::current()->player
;
+ MovingObject* player =
this->get_nearest_player()
;
MovingObject* badguy = this;
const Vector playerPos = player->get_pos();
const Vector badguyPos = badguy->get_pos();
MovingObject* badguy = this;
const Vector playerPos = player->get_pos();
const Vector badguyPos = badguy->get_pos();
@@
-111,10
+110,10
@@
AngryStone::active_update(float elapsed_time) {
if ((dx > -playerWidth) && (dx < badguyWidth)) {
if (dy > 0) {
attackDirection.x = 0;
if ((dx > -playerWidth) && (dx < badguyWidth)) {
if (dy > 0) {
attackDirection.x = 0;
- attackDirection.y =
-
1;
+ attackDirection.y = 1;
} else {
attackDirection.x = 0;
} else {
attackDirection.x = 0;
- attackDirection.y = 1;
+ attackDirection.y =
-
1;
}
if ((attackDirection.x != oldWallDirection.x) || (attackDirection.y != oldWallDirection.y)) {
sprite->set_action("charging");
}
if ((attackDirection.x != oldWallDirection.x) || (attackDirection.y != oldWallDirection.y)) {
sprite->set_action("charging");