Add editable terrain objects

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 598bf82bcf4c0a1763a22d9b78562b21c4d6e00e..0025ec3b5b3adcd305ebd08ec8b8a9c44b8622ac 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -13,6 +13,7 @@
 #include "route.h"
 #include "signal.h"
 #include "signaltype.h"
+#include "terrain.h"
 #include "track.h"
 #include "trackcircuit.h"
 #include "tracktype.h"
@@ -39,7 +40,7 @@ namespace R2C2 {
 Layout::Layout(Catalogue &c, Driver *d):
        catalogue(c),
        driver(d),
-       next_turnout_id(0x800)
+       next_turnout_addr(0x800)
 {
        clock.set_rate(60);
 }
@@ -135,6 +136,12 @@ const set<Vehicle *> &Layout::get_all<Vehicle>() const
        return objects.get<Vehicle>();
 }
 
+template<>
+const set<Terrain *> &Layout::get_all<Terrain>() const
+{
+       return objects.get<Terrain>();
+}
+
 template<>
 const set<TrackChain *> &Layout::get_all<TrackChain>() const
 {
@@ -227,18 +234,18 @@ void Layout::remove(BeamGate &g)
        remove(static_cast<Sensor &>(g));
 }
 
-unsigned Layout::allocate_turnout_id()
+unsigned Layout::allocate_turnout_address()
 {
-       set<unsigned> used_ids;
+       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_id())
-                       used_ids.insert((*i)->get_turnout_id());
+               if((*i)->get_turnout_address())
+                       used_addrs.insert((*i)->get_turnout_address());
 
-       unsigned result = next_turnout_id;
-       while(used_ids.count(result))
+       unsigned result = next_turnout_addr;
+       while(used_addrs.count(result))
                ++result;
-       next_turnout_id = result+1;
+       next_turnout_addr = result+1;
 
        return result;
 }
@@ -414,6 +421,15 @@ void Layout::save(const string &fn) const
                writer.write(st);
        }
 
+       const set<Terrain *> &terrains = objects.get<Terrain>();
+       for(set<Terrain *>::const_iterator i=terrains.begin(); i!=terrains.end(); ++i)
+       {
+               DataFile::Statement st("terrain");
+               st.append((*i)->get_type().get_article_number());
+               (*i)->save(st.sub);
+               writer.write(st);
+       }
+
        const set<BeamGate *> &gates = objects.get<BeamGate>();
        for(set<BeamGate *>::const_iterator i=gates.begin(); i!=gates.end(); ++i)
        {
@@ -449,8 +465,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 tid = (*i)->get_turnout_id())
-                       writer.write((DataFile::Statement("turnout"), tid, (*i)->get_active_path()));
+               if(unsigned taddr = (*i)->get_turnout_address())
+                       writer.write((DataFile::Statement("turnout"), taddr, (*i)->get_active_path()));
 
        for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
        {
@@ -528,13 +544,13 @@ 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);
        add("route", &Loader::route);
        add("signal", &Loader::signal);
+       add("terrain", &Loader::terrain);
        add("track", &Loader::track);
        add("train", &Loader::train);
        add("turnout", &Loader::turnout);
@@ -559,11 +575,16 @@ void Layout::Loader::signal(ArticleNumber art_nr)
        load_sub(*sig);
 }
 
+void Layout::Loader::terrain(ArticleNumber art_nr)
+{
+       Terrain *ter = new Terrain(obj, obj.catalogue.get<TerrainType>(art_nr));
+       load_sub(*ter);
+}
+
 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)