Add editable terrain objects

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index c23ad38fb1d39969c2463ebab919ea165a3b0895..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"
@@ -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
 {
@@ -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)
        {
@@ -534,6 +550,7 @@ Layout::Loader::Loader(Layout &l):
        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);
@@ -558,6 +575,12 @@ 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));