X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=1abf535c06b6d03a0649c95162b7264da1802c73;hb=3133b97af17c8a11fb3364453b53d970790a1426;hp=0c741722d7b7dfecf749be196183bbb1df3a3e58;hpb=a4566a4a23ff676f11a90615e8e468ef50107946;p=r2c2.git

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index 0c74172..1abf535 100644
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -60,6 +60,8 @@ Train::Train(Layout &l, const LocoType &t, unsigned a):
 	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Train::sensor_event));
 	layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Train::turnout_event));
 
+	layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event));
+
 	control->signal_control_changed.connect(signal_control_changed);
 }
 
@@ -262,6 +264,8 @@ float Train::get_reserved_distance() const
 	const VehicleType &vtype = veh.get_type();
 
 	Track *track = veh.get_track();
+	if(!track)
+		return 0;
 	unsigned entry = veh.get_entry();
 
 	float result = -vtype.get_length()/2;
@@ -281,6 +285,9 @@ float Train::get_reserved_distance() const
 			result += track->get_type().get_path_length(track->get_active_path());
 		first = false;
 
+		if(track->get_type().get_endpoints().size()<2)
+			return result;
+
 		unsigned exit = track->traverse(entry);
 		Track *next = track->get_link(exit);
 
@@ -315,10 +322,10 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 	float speed = control->get_speed();
 	unsigned speed_notch = find_speed(abs(speed));
 
-	if(speed && (speed<0)!=reverse)
+	if(control->get_reverse()!=reverse)
 	{
-		driver.set_loco_reverse(address, speed<0);
-		reverse = speed<0;
+		reverse = control->get_reverse();
+		driver.set_loco_reverse(address, reverse);
 
 		release_blocks(rsv_blocks);
 		reverse_blocks(cur_blocks);
@@ -357,11 +364,60 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 		{
 			overshoot_dist += d;
 			if(overshoot_dist>40*layout.get_catalogue().get_scale())
+			{
 				layout.emergency(name+" has not arrived at sensor");
+				accurate_position = false;
+			}
 		}
 	}
 	else if(end_of_route)
 		set_route(0);
+
+	if(!cur_blocks.empty() && !cur_blocks.front().block->get_sensor_id())
+	{
+		Vehicle &veh = *(reverse ? vehicles.front() : vehicles.back());
+
+		list<BlockRef>::iterator i = cur_blocks.begin();
+		const Block::Endpoint &bep = i->block->get_endpoints()[i->entry];
+
+		Track *track = bep.track;
+		unsigned entry = bep.track_ep;
+
+		bool found = false;
+		float dist = veh.get_offset()-veh.get_type().get_length()/2;
+		while(1)
+		{
+			if(track==veh.get_track())
+			{
+				found = true;
+				break;
+			}
+
+			if(i!=cur_blocks.begin())
+			{
+				float path_len = track->get_type().get_path_length(track->get_active_path());
+				dist += path_len;
+			}
+
+			unsigned exit = track->traverse(entry);
+			Track *next = track->get_link(exit);
+			entry = next->get_endpoint_by_link(*track);
+			track = next;
+
+			if(!i->block->get_tracks().count(track))
+			{
+				++i;
+				if(i==cur_blocks.end())
+					break;
+			}
+		}
+
+		if(found && i!=cur_blocks.begin() && dist>10*layout.get_catalogue().get_scale())
+		{
+			cur_blocks.front().block->reserve(0);
+			cur_blocks.erase(cur_blocks.begin());
+		}
+	}
 }
 
 void Train::save(list<DataFile::Statement> &st) const
@@ -390,7 +446,12 @@ void Train::save(list<DataFile::Statement> &st) const
 	}
 
 	if(route)
-		st.push_back((DataFile::Statement("route"), route->get_name()));
+	{
+		if(!route->is_temporary())
+			st.push_back((DataFile::Statement("route"), route->get_name()));
+		else if(next_route && !next_route->is_temporary())
+			st.push_back((DataFile::Statement("route"), next_route->get_name()));
+	}
 
 	if(timetable)
 	{
@@ -524,15 +585,15 @@ void Train::sensor_event(unsigned addr, bool state)
 				if(layout.get_driver().get_sensor(i->block->get_sensor_id()))
 					break;
 				else
+				{
 					end = i;
+					++end;
+				}
 			}
 		
 		if(end!=cur_blocks.begin())
-		{
 			// Free blocks up to the last inactive sensor
-			++end;
 			release_blocks(cur_blocks, cur_blocks.begin(), end);
-		}
 	}
 }
 
@@ -547,6 +608,12 @@ void Train::turnout_event(unsigned addr, bool)
 	}
 }
 
+void Train::halt_event(bool h)
+{
+	if(h)
+		accurate_position = false;
+}
+
 void Train::block_reserved(const Block &block, const Train *train)
 {
 	if(&block==pending_block && !train)
@@ -592,6 +659,13 @@ unsigned Train::reserve_more()
 	unsigned good_sens = nsens;
 	while(good_sens<3)
 	{
+		if(last->block->get_endpoints().size()<2)
+		{
+			good = last;
+			good_sens = nsens;
+			break;
+		}
+
 		// Traverse to the next block
 		unsigned exit = last->block->traverse(last->entry);
 		Block *link = last->block->get_link(exit);