Prefer is_turnout() when checking if a track is, in fact, a turnout

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index ac7101dfcf4e49708f8571a0f62bc4a9df292db4..b4eb8faacdbdb52d5d4786fe8495c747762c1c6a 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -188,12 +188,21 @@ template<typename T>
 T *Layout::pick(const Ray &ray)
 {
        const set<Object *> &objs = objects.get();
+       T *closest = 0;
+       float distance = -1;
        for(set<Object *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
                if(T *t = dynamic_cast<T *>(*i))
-                       if(t->collide_ray(ray))
-                               return t;
+               {
+                       float d = -1;
+                       if(t->collide_ray(ray, &d))
+                               if(!closest || d<distance)
+                               {
+                                       closest = t;
+                                       distance = d;
+                               }
+               }
 
-       return 0;
+       return closest;
 }
 
 template Object *Layout::pick<Object>(const Ray &);
@@ -239,7 +248,7 @@ unsigned Layout::allocate_turnout_address()
        set<unsigned> used_addrs;
        const set<Track *> &tracks = objects.get<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if((*i)->get_turnout_address())
+               if((*i)->get_type().is_turnout())
                        used_addrs.insert((*i)->get_turnout_address());
 
        unsigned result = next_turnout_addr;
@@ -471,8 +480,8 @@ void Layout::save_dynamic(const string &fn) const
 
        const set<Track *> &tracks = objects.get<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if(unsigned taddr = (*i)->get_turnout_address())
-                       writer.write((DataFile::Statement("turnout"), taddr, (*i)->get_active_path()));
+               if((*i)->get_type().is_turnout())
+                       writer.write((DataFile::Statement("turnout"), (*i)->get_turnout_address(), (*i)->get_active_path()));
 
        for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
        {