X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fobject.h;h=a0bd4f362714313bd72c5bc28b7c120bfd4f119f;hb=b85fa11e45805cd71383577642030d8d01f43447;hp=f8e895848f7ef17e17c59c1f535962a7a2dff12b;hpb=f23c8d8cbc4e72b45e3a719b2cf974ce35d054e9;p=r2c2.git

diff --git a/source/libr2c2/object.h b/source/libr2c2/object.h
index f8e8958..a0bd4f3 100644
--- a/source/libr2c2/object.h
+++ b/source/libr2c2/object.h
@@ -19,8 +19,9 @@ protected:
 	Vector position;
 	Angle rotation;
 	Angle tilt;
+	Shape *shape;
 
-	Object(Layout &l): layout(l) { }
+	Object(Layout &);
 public:
 	virtual ~Object() { }
 
@@ -51,7 +52,8 @@ public:
 	virtual bool break_link(unsigned) { return false; }
 	virtual void break_links();
 
-	virtual bool collide_ray(const Ray &) const;
+	const Shape *get_shape() const;
+	virtual bool collide_ray(const Ray &, float * = 0) const;
 	virtual BoundingBox get_bounding_box() const;
 };