X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=42d3e01e1f87b1675d9edd32fd7439533ced4af4;hb=010d8321e982d1684fcbff5bf6fc2bdec7cb7bae;hp=341921aaf511000a406869cd78f0b566641ec420;hpb=38fb8d56efde037a71c46a58bda314655e68ab6c;p=r2c2.git

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index 341921a..42d3e01 100644
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -36,6 +36,8 @@ Train::Train(TrafficManager &tm, Locomotive &l):
 {
 	trfc_mgr.add_train(this);
 
+	loco.signal_reverse_changed.connect(sigc::mem_fun(this, &Train::locomotive_reverse_changed));
+
 	const map<unsigned, Sensor *> &sensors = trfc_mgr.get_control().get_sensors();
 	for(map<unsigned, Sensor *>::const_iterator i=sensors.begin(); i!=sensors.end(); ++i)
 		i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::sensor_event), i->second));
@@ -57,6 +59,8 @@ void Train::set_name(const string &n)
 
 void Train::set_speed(unsigned speed)
 {
+	if(speed==target_speed)
+		return;
 	if(!target_speed && speed)
 		travel_speed = static_cast<int>(round(speed*speed_scale*87*3.6/5))*5;
 
@@ -71,10 +75,17 @@ void Train::set_speed(unsigned speed)
 	else
 		reserve_more();
 
+	signal_target_speed_changed.emit(target_speed);
+
 	update_speed();
 	pure_speed = false;
 }
 
+void Train::set_reverse(bool rev)
+{
+	loco.set_reverse(rev);
+}
+
 void Train::place(Block *block, unsigned entry)
 {
 	for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end();)
@@ -166,6 +177,18 @@ void Train::save(list<DataFile::Statement> &st) const
 	st.push_back((DataFile::Statement("speed_scale"), speed_scale, speed_scale_weight));
 }
 
+void Train::locomotive_reverse_changed(bool)
+{
+	for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+		i->block->reserve(0);
+	rsv_blocks.clear();
+	cur_blocks.reverse();
+	for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+		i->entry = i->block->traverse(i->entry);
+	reserve_more();
+	update_speed();
+}
+
 void Train::sensor_event(bool state, Sensor *sensor)
 {
 	unsigned addr = sensor->get_address();