Update #includes that have been renamed, and remove stray ones

[r2c2.git] / source / libr2c2 / catalogue.cpp

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 838b15bd254638fa22e8b367fdf843022e5276ab..df59a0ee20ef7e73a5235762ced88a59e23dfd7a 100644 (file)
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
@@ -82,6 +75,7 @@ Catalogue::Loader::Loader(Catalogue &c):
        add("scale", &Loader::scale);
        add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
        add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+       add("track_technique", &Catalogue::track_technique);
        add("vehicle", static_cast<void (Loader::*)(unsigned)>(&Loader::vehicle));
        add("vehicle", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::vehicle));
 }
@@ -95,8 +89,8 @@ void Catalogue::Loader::gauge(float g)
 {
        obj.gauge = g/1000;
        obj.path_profile = Profile();
-       obj.path_profile.append_point(Point(0.1*obj.gauge, 0));
-       obj.path_profile.append_point(Point(-0.1*obj.gauge, 0));
+       obj.path_profile.append_vertex(Vector(0.1*obj.gauge, 0), false);
+       obj.path_profile.append_vertex(Vector(-0.1*obj.gauge, 0), false);
 }
 
 void Catalogue::Loader::layout()