Get rid of some obsolete #includes

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

diff --git a/source/libr2c2/beamgate.cpp b/source/libr2c2/beamgate.cpp
index 614bce9657916152431cda52c1ce0853ba76c318..15c2b8e05fea22587ccb0fb114441b2b805d1cc2 100644 (file)
--- a/source/libr2c2/beamgate.cpp
+++ b/source/libr2c2/beamgate.cpp
@@ -1,5 +1,4 @@
 #include "beamgate.h"
-#include "catalogue.h"
 #include "layout.h"
 
 using namespace std;
@@ -13,17 +12,17 @@ BeamGate::BeamGate(Layout &l):
 {
        invert = true;
 
-       layout.add(*this);
+       TrackAttachment::layout.add(*this);
 }
 
 BeamGate::~BeamGate()
 {
-       layout.remove(*this);
+       TrackAttachment::layout.remove(*this);
 }
 
 BeamGate *BeamGate::clone(Layout *to_layout) const
 {
-       BeamGate *gate = new BeamGate(to_layout ? *to_layout : layout);
+       BeamGate *gate = new BeamGate(to_layout ? *to_layout : TrackAttachment::layout);
        gate->set_position(position);
        gate->set_rotation(rotation);
        return gate;
@@ -50,13 +49,14 @@ void BeamGate::set_rotation(const Angle &r)
 
 void BeamGate::update_attachment()
 {
-       attach_to_closest(100*layout.get_catalogue().get_gauge());
+       attach_to_closest(100);
 
        if(track)
        {
-               TrackPoint tp = track->get_point(track.entry(), offset);
-               position = tp.pos;
-               rotation = tp.dir;
+               OrientedPoint p = track.point();
+               position = p.position;
+               rotation = p.rotation;
+               tilt = p.tilt;
        }
 }