Fix memory leaks and other bad stuff

[r2c2.git] / source / libmarklin / endpoint.h

diff --git a/source/libmarklin/endpoint.h b/source/libmarklin/endpoint.h
index 6a46831cc35065eabc79d02d8287129a8bc998a4..7382404a0d10c248cb2ee6d2a6fad6a4870b368d 100644 (file)
--- a/source/libmarklin/endpoint.h
+++ b/source/libmarklin/endpoint.h
@@ -1,16 +1,25 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef MARKLIN_ENDPOINT_H_
 #define MARKLIN_ENDPOINT_H_
 
+#include "geometry.h"
+
 namespace Marklin {
 
 struct Endpoint
 {
-       float  x, y;
-       float  dir;  // Direction outwards from the endpoint
-       unsigned routes;
+       Point pos;
+       float dir;  // Direction outwards from the endpoint
+       unsigned paths;
 
-       Endpoint(): x(0), y(0), dir(0), routes(0) { }
-       Endpoint(float x_, float y_, float d, unsigned r): x(x_), y(y_), dir(d), routes(r) { }
+       Endpoint(): dir(0), paths(0) { }
+       Endpoint(float x, float y, float d, unsigned p): pos(x, y), dir(d), paths(p) { }
 };
 
 } // namespace Marklin