Major architecture rework

[r2c2.git] / source / libmarklin / tracktype.cpp

diff --git a/source/libmarklin/tracktype.cpp b/source/libmarklin/tracktype.cpp
index c6757cb221b12b9a206bdf6b0295f13fb835c789..5bbd40a411e07632e161dbb9d1a44a099dfeb41e 100644 (file)
--- a/source/libmarklin/tracktype.cpp
+++ b/source/libmarklin/tracktype.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -35,15 +35,32 @@ float TrackType::get_path_length(int p) const
        return len;
 }
 
-unsigned TrackType::get_n_paths() const
+unsigned TrackType::get_paths() const
 {
-       unsigned n = 1;
+       unsigned mask = 0;
        for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-               if(i->path>=n)
-                       n = i->path+1;
+               mask |= 1<<i->path;
+       return mask;
+}
+
+unsigned TrackType::get_n_paths() const
+{
+       unsigned n = 0;
+       for(unsigned mask = get_paths(); mask; ++n)
+               mask &= mask-1;
        return n;
 }
 
+bool TrackType::is_turnout() const
+{
+       return endpoints.size()>2;
+}
+
+bool TrackType::is_double_address() const
+{
+       return get_n_paths()>2;
+}
+
 void TrackType::collect_endpoints()
 {
        endpoints.clear();