X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fbullet.hpp;h=c3464d7d5344330786491a65d5fe1f933199f799;hb=ca967dcf4ee89f99880355be00782d1cd047be6a;hp=43d4c3e940508e73806410d3edf0d821707a2c3c;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/object/bullet.hpp b/src/object/bullet.hpp
index 43d4c3e94..c3464d7d5 100644
--- a/src/object/bullet.hpp
+++ b/src/object/bullet.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 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
@@ -12,39 +12,46 @@
 //  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
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef __BULLET_H__
 #define __BULLET_H__
 
 #include "moving_object.hpp"
 #include "physic.hpp"
 #include "sprite/sprite.hpp"
+#include "player_status.hpp"
 
-enum BulletsKind {
-  FIRE_BULLET,
-  ICE_BULLET
-};
-
-class Bullet : public MovingObject
+class Bullet : public MovingObject, private UsesPhysic
 {
 public:
-  Bullet(const Vector& pos, float xm, int dir, int kind);
+  Bullet(const Vector& pos, float xm, int dir, BonusType type);
   ~Bullet();
-  
+
   void update(float elapsed_time);
   void draw(DrawingContext& context);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
-  int kind;        
-  
+  /**
+   * Makes bullet bounce off an object (that got hit).
+   * To be called by the collision handler of that object.
+   * Note that the @c hit parameter is filled in as perceived by the object, not by the bullet.
+   */
+  void ricochet(GameObject& other, const CollisionHit& hit);
+
+  BonusType get_type()
+  {
+    return type;
+  }
+
 private:
   int life_count;
-  Physic physic;
-  Sprite* sprite;
+  std::auto_ptr<Sprite> sprite;
+  BonusType type;
 };
 
 #endif