X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftracktype.h;h=7eb2bdc64d15bcfb4cbc853f14b23374583e1c1c;hb=b14059de03324aecde3efc649293d98ce5b7aaf2;hp=fb40ac9473708623c3560ac586f4b79a8557902b;hpb=247742fbc1c27bfc9fdef4630afcdc2408cdd550;p=r2c2.git

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index fb40ac9..7eb2bdc 100644
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -20,7 +20,7 @@ class TrackType
 public:
 	struct Endpoint
 	{
-		Point pos;
+		Vector pos;
 		float dir;  // Direction outwards from the endpoint
 		unsigned paths;
 
@@ -48,6 +48,7 @@ private:
 	std::vector<Endpoint> endpoints;
 	unsigned state_bits;
 	unsigned autofit_preference;
+	std::string object;
 
 public:
 	TrackType(const ArticleNumber &);
@@ -62,10 +63,12 @@ public:
 	bool is_turnout() const;
 	bool is_dead_end() const;
 	unsigned get_autofit_preference() const { return autofit_preference; }
+	const std::string &get_object() const { return object; }
 	const std::vector<TrackPart> &get_parts() const { return parts; }
 	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
 	const Endpoint &get_endpoint(unsigned) const;
 	TrackPoint get_point(unsigned, unsigned, float) const;
+	bool collide_ray(const Vector &, const Vector &, float) const;
 
 private:
 	void collect_endpoints();