Some variable cleanup

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 674722bb9d21b6951bd0f8b0405fad8e4ecd4db3..e28558a7e0cd9e715e32722900dae39e544729b3 100644 (file)
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -28,6 +28,7 @@ struct BlockAllocator::BlockMatch
 
 BlockAllocator::BlockAllocator(Train &t):
        train(t),
+       active(false),
        cur_blocks_end(blocks.end()),
        next_sensor(0),
        pending_block(0),

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 598bf82bcf4c0a1763a22d9b78562b21c4d6e00e..c2de1c599a08712ec1893602e527d96972d2a246 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -528,8 +528,7 @@ void Layout::Storage<B>::del()
 
 
 Layout::Loader::Loader(Layout &l):
-       DataFile::ObjectLoader<Layout>(l),
-       new_tracks(false)
+       DataFile::ObjectLoader<Layout>(l)
 {
        add("base",  &Layout::base);
        add("beamgate", &Loader::beamgate);
@@ -563,7 +562,6 @@ void Layout::Loader::track(ArticleNumber art_nr)
 {
        Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
        load_sub(*trk);
-       new_tracks = true;
        const set<Track *> &tracks = obj.objects.get<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                if(*i!=trk)

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 26df423ed731b3f461f912ee04b4c57e19fde08e..59eae083d05253b6d8c7d5a5e80ad0498d136c94 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -30,9 +30,6 @@ class Layout
 public:
        class Loader: public Msp::DataFile::ObjectLoader<Layout>
        {
-       private:
-               bool new_tracks;
-
        public:
                Loader(Layout &);
        private: