X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftrack.h;h=480b1a33d42abd072ea8cc6f1f59523b65c5d486;hb=eab144208f380f638295efac3c5ef234dc39ac54;hp=8f75f78fc1c093f94e83f74e70a5518b1f378aa3;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git

diff --git a/source/libr2c2/track.h b/source/libr2c2/track.h
index 8f75f78..480b1a3 100644
--- a/source/libr2c2/track.h
+++ b/source/libr2c2/track.h
@@ -1,17 +1,10 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_TRACK_H_
 #define LIBR2C2_TRACK_H_
 
 #include <list>
 #include <set>
 #include <sigc++/trackable.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "geometry.h"
 
 namespace R2C2 {
@@ -23,7 +16,7 @@ class TrackType;
 class Track: public sigc::trackable
 {
 public:
-	class Loader: public Msp::DataFile::BasicLoader<Track>
+	class Loader: public Msp::DataFile::ObjectLoader<Track>
 	{
 	public:
 		Loader(Track &);
@@ -89,6 +82,8 @@ public:
 	TrackPoint get_point(unsigned, unsigned, float) const;
 	TrackPoint get_point(unsigned, float) const;
 
+	bool collide_ray(const Vector &, const Vector &);
+
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
 	void turnout_event(unsigned, unsigned);