X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmoving_object.h;h=973595304118d2dd5f514e58bb0513813f0e964f;hb=ddc3b7ef2077567d368e244a292b41187311e8e3;hp=d9659a302481c8af9469945c143892c76e86bcb1;hpb=308f11e38981077626fe0ea9887094f3c28b02f9;p=supertux.git

diff --git a/src/moving_object.h b/src/moving_object.h
index d9659a302..973595304 100644
--- a/src/moving_object.h
+++ b/src/moving_object.h
@@ -1,4 +1,4 @@
-//  $Id$
+//  $Id: moving_object.h 2295 2005-03-30 01:52:14Z matzebraun $
 //
 //  SuperTux -  A Jump'n Run
 //  Copyright (C) 2004 Matthias Braun <matze@braunis.de
@@ -16,14 +16,16 @@
 //  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.
-
 #ifndef SUPERTUX_MOVING_OBJECT_H
 #define SUPERTUX_MOVING_OBJECT_H
 
-#include "type.h"
 #include "game_object.h"
-#include "vector.h"
-//#include "rectangle.h"
+#include "collision_hit.h"
+#include "math/vector.h"
+#include "math/rect.h"
+
+class Sector;
+class CollisionGrid;
 
 /**
  * Base class for all dynamic/moving game objects. This class contains things
@@ -34,28 +36,48 @@ class MovingObject : public GameObject
 public:
   MovingObject();
   virtual ~MovingObject();
-
+  
   /** this function is called when the object collided with any other object
    */
-  virtual void collision(const MovingObject& other_object, 
-          int collision_type) = 0;
-
-  Vector get_pos() const
-  { return Vector(base.x, base.y); }
-
-  base_type base;
-  base_type old_base;
-
+  virtual HitResponse collision(GameObject& other,
+                                const CollisionHit& hit) = 0;
+  
+  const Vector& get_pos() const
+  {
+    return bbox.p1;
+  }
+  
+  /** returns the bounding box of the Object */
+  const Rect& get_bbox() const
+  {
+    return bbox;
+  }
+  
+  const Vector& get_movement() const
+  {
+    return movement;
+  }
+  
+  /** places the moving object at a specific position. Be carefull when
+   * using this function. There are no collision detection checks performed
+   * here so bad things could happen.
+   */
+  virtual void set_pos(const Vector& pos)
+  {
+    bbox.set_pos(pos);
+  }
+  
 protected:
-#if 0 // this will be used in my collision detection rewrite later
-  /// the current position of the object
-  Vector pos;
-  /// the position we want to move until next frame
-  Vector new_pos;
-  /// the bounding box relative to the current position
-  Rectangle bounding_box;
-#endif
+  friend class Sector;
+  friend class CollisionGrid;
+  
+  /** The bounding box of the object (as used for collision detection, this
+   * isn't necessarily the bounding box for graphics)
+   */
+  Rect bbox;
+  /** The movement that will happen till next frame
+   */
+  Vector movement;
 };
 
-#endif /*SUPERTUX_MOVING_OBJECT_H*/
-
+#endif