Remove some unnecessary proxy functions

[r2c2.git] / source / 3d / allocation.cpp

diff --git a/source/3d/allocation.cpp b/source/3d/allocation.cpp
index 4bafb111c7e60e02cd018960d599d9c24796a216..3835f8c8df2ba99ae70c0c597025c9cc189bac78 100644 (file)
--- a/source/3d/allocation.cpp
+++ b/source/3d/allocation.cpp
@@ -29,10 +29,7 @@ void Allocation3D::set_color(const GL::Color &c)
 
 void Allocation3D::block_reserved(Block &block, Train *t)
 {
-       if(t && t!=&train)
-               return;
-
-       if(t)
+       if(t==&train)
        {
                if(paths.count(&block))
                        return;
@@ -41,7 +38,7 @@ void Allocation3D::block_reserved(Block &block, Train *t)
                const Block::TrackSet &tracks = block.get_tracks();
                for(Block::TrackSet::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
-                       Path3D *path = new Path3D(layout.get<Track3D>(**i));
+                       Path3D *path = new Path3D(layout.get_3d(**i));
                        bpaths.push_back(path);
                        path->set_layer(1);
                        float intensity = 0.5+train.get_block_allocator().is_block_current(block)*0.5;