X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicle.h;h=e7427b1e92ef6bb61b95ae48b9241664997b7413;hb=9f4f169affcedcf249e935f93e0a15ed60232f6a;hp=bd815ab19f497bec7d07470d09700186765548ce;hpb=7a36d396eded897c421424905b2c938d770df341;p=r2c2.git

diff --git a/source/libr2c2/vehicle.h b/source/libr2c2/vehicle.h
index bd815ab..e7427b1 100644
--- a/source/libr2c2/vehicle.h
+++ b/source/libr2c2/vehicle.h
@@ -3,12 +3,12 @@
 
 #include "geometry.h"
 #include "object.h"
+#include "trackiter.h"
 #include "vehicletype.h"
 
 namespace R2C2 {
 
 class Layout;
-class Track;
 
 class attachment_error: public std::logic_error
 {
@@ -59,12 +59,11 @@ public:
 private:
 	struct TrackPosition
 	{
-		Track *track;
-		unsigned ep;
+		TrackIter track;
 		float offs;
 
 		TrackPosition();
-		TrackPosition(Track *, unsigned, float);
+		TrackPosition(const TrackIter &, float);
 		void advance(float);
 		TrackPoint get_point() const;
 	};
@@ -96,11 +95,12 @@ public:
 	// TODO implement these - should call place() with suitable parameters
 	virtual void set_position(const Vector &) { }
 	virtual void set_rotation(const Angle &) { }
-	void place(Track &, unsigned, float, PlaceMode = CENTER);
+	void place(const TrackIter &, float, PlaceMode = CENTER);
 	void unplace();
 	void advance(float);
-	Track *get_track() const { return track_pos.track; }
-	unsigned get_entry() const { return track_pos.ep; }
+	const TrackIter &get_track_iter() const { return track_pos.track; }
+	Track *get_track() const { return track_pos.track.track(); }
+	unsigned get_entry() const { return track_pos.track.entry(); }
 	float get_offset() const { return track_pos.offs; }
 	const Axle &get_fixed_axle(unsigned) const;
 	const Bogie &get_bogie(unsigned) const;
@@ -124,8 +124,6 @@ public:
 	virtual unsigned get_n_link_slots() const;
 	virtual Vehicle *get_link(unsigned) const;
 	virtual int get_link_slot(const Object &) const;
-
-	virtual bool collide_ray(const Vector &, const Vector &) const { return false; }
 };
 
 } // namespace R2C2