X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=dc07c191991b7cebe4de15f44d9aa85d91cd00b2;hb=d0881a98a6240758ac1aeceaa9443d718ab1ad5c;hp=af7304da6aeef557f3f4f8119d08cc4aaca1ace4;hpb=02c12263ac40289afc626156358ebb705ed84a5b;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index af7304d..dc07c19 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <msp/core/maputils.h>
+#include <msp/core/raii.h>
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include <msp/datafile/writer.h>
@@ -412,7 +413,7 @@ void Layout::remove_train(Train &t)
 		signal_train_removed.emit(t);
 }
 
-void Layout::tick()
+void Layout::tick(float speed)
 {
 	if(driver)
 		driver->tick();
@@ -423,6 +424,15 @@ void Layout::tick()
 		dt = t-last_tick;
 	last_tick = t;
 
+	dt *= speed;
+	unsigned count = dt/(10*Time::msec)+1;
+	dt /= count;
+	while(count--)
+		step(dt);
+}
+
+void Layout::step(const Time::TimeDelta &dt)
+{
 	if(!driver || !driver->is_halted())
 		clock.tick(dt);
 
@@ -523,7 +533,12 @@ 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((*i)->get_type().is_turnout())
-			writer.write((DataFile::Statement("turnout"), (*i)->get_turnout_address(), (*i)->get_active_path()));
+		{
+			DataFile::Statement st("turnout");
+			st.append((*i)->get_turnout_address());
+			(*i)->save_dynamic(st.sub);
+			writer.write(st);
+		}
 
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{
@@ -613,6 +628,9 @@ Layout::Loader::Loader(Layout &l):
 	add("train", &Loader::train);
 	add("turnout", &Loader::turnout);
 	add("zone",  &Loader::zone);
+
+	// Deprecated
+	add("turnout", &Loader::turnout2);
 }
 
 void Layout::Loader::beamgate()
@@ -660,8 +678,24 @@ void Layout::Loader::train(const string &n, unsigned addr, const std::string &pr
 	load_sub(*trn);
 }
 
-void Layout::Loader::turnout(unsigned addr, unsigned path)
+void Layout::Loader::turnout(unsigned addr)
+{
+	/* Kinda slow, but maintaining a map of turnouts seems more trouble than
+	it's worth at this point. */
+	const set<Track *> &tracks = obj.objects.get<Track>();
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if((*i)->get_turnout_address()==addr)
+		{
+			load_sub(**i);
+			return;
+		}
+
+	throw key_error(addr);
+}
+
+void Layout::Loader::turnout2(unsigned addr, unsigned path)
 {
+	// XXX Discrepancy between ids and addresses
 	if(obj.driver)
 		obj.driver->set_turnout(addr, path);
 }