X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftracktype.cpp;h=35d220821500e1621dbb19bc732587398154507b;hb=baa096deb2108fe7f692172602ec2d047b68c068;hp=4ac096767bac5a1e5efa580f4c8da5c3c700a46b;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/tracktype.cpp b/source/libr2c2/tracktype.cpp
index 4ac0967..35d2208 100644
--- a/source/libr2c2/tracktype.cpp
+++ b/source/libr2c2/tracktype.cpp
@@ -15,7 +15,7 @@ namespace R2C2 {
 
 TrackType::TrackType(const ArticleNumber &an):
 	art_nr(an),
-	double_address(false),
+	state_bits(0),
 	autofit_preference(1)
 { }
 
@@ -171,11 +171,13 @@ TrackType::Endpoint::Endpoint(float x, float y, float d, unsigned p):
 
 
 TrackType::Loader::Loader(TrackType &t):
-	Msp::DataFile::BasicLoader<TrackType>(t)
+	Msp::DataFile::BasicLoader<TrackType>(t),
+	state_bits_set(false)
 {
 	add("autofit_preference", &TrackType::autofit_preference);
 	add("description", &TrackType::description);
-	add("double_address", &TrackType::double_address);
+	add("object",      &TrackType::object);
+	add("state_bits",  &Loader::state_bits);
 	add("part",        &Loader::part);
 }
 
@@ -189,6 +191,15 @@ void TrackType::Loader::part()
 	TrackPart p;
 	load_sub(p);
 	obj.parts.push_back(p);
+	if(!state_bits_set && p.get_path())
+		while(p.get_path()>=(1U<<obj.state_bits))
+			++obj.state_bits;
+}
+
+void TrackType::Loader::state_bits(unsigned b)
+{
+	obj.state_bits = b;
+	state_bits_set = true;
 }
 
 } // namespace R2C2