From e8f7edf76b317dd795fca90d64ef821eba07c142 Mon Sep 17 00:00:00 2001 From: Christoph Sommer Date: Fri, 3 Mar 2006 22:17:15 +0000 Subject: [PATCH] angrystone is now invulnerable SVN-Revision: 3068 --- src/badguy/angrystone.cpp | 10 ++++++++-- src/badguy/angrystone.hpp | 5 +++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/badguy/angrystone.cpp b/src/badguy/angrystone.cpp index ee47848b4..ff7c86257 100644 --- a/src/badguy/angrystone.cpp +++ b/src/badguy/angrystone.cpp @@ -1,7 +1,7 @@ // $Id: angrystone.cpp 2979 2006-01-10 00:00:04Z matzebraun $ // -// SuperTux -// Copyright (C) 2005 Matthias Braun +// AngryStone - A spiked block that charges towards the player +// Copyright (C) 2006 Christoph Sommer // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -73,6 +73,12 @@ AngryStone::collision_solid(GameObject& , const CollisionHit& hit) return CONTINUE; } +void +AngryStone::kill_fall() +{ + //prevents AngryStone from getting killed by other enemies or the player +} + HitResponse AngryStone::collision_badguy(BadGuy& badguy, const CollisionHit& ) { diff --git a/src/badguy/angrystone.hpp b/src/badguy/angrystone.hpp index 106accc9a..13a5d2851 100644 --- a/src/badguy/angrystone.hpp +++ b/src/badguy/angrystone.hpp @@ -1,7 +1,7 @@ // $Id: angrystone.hpp 2642 2005-06-26 13:38:53Z matzebraun $ // -// SuperTux -// Copyright (C) 2005 Matthias Braun +// AngryStone - A spiked block that charges towards the player +// Copyright (C) 2006 Christoph Sommer // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -33,6 +33,7 @@ public: HitResponse collision_solid(GameObject& other, const CollisionHit& hit); HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); void active_update(float elapsed_time); + void kill_fall(); protected: Vector attackDirection; /**< 1-normalized vector of current attack direction */ -- 2.11.0