X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=ea4599fa9545eb2465d9ba2d0a1a5c85efc583d5;hb=2c0a478641a10a739557d055f80354a28936ced1;hp=0cbe306234c09b11a9535f1e21fe71673e4bed2e;hpb=90f9efba8d88f41c7a180734b7bcbdd1501d995e;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 0cbe306..ea4599f 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -76,7 +76,7 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 
 	layout.add_train(*this);
 
-	layout.get_driver().add_loco(address, protocol);
+	layout.get_driver().add_loco(address, protocol, loco_type);
 	layout.get_driver().signal_loco_speed.connect(sigc::mem_fun(this, &Train::loco_speed_event));
 	layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event));
 
@@ -186,10 +186,7 @@ void Train::set_function(unsigned func, bool state)
 {
 	if(!loco_type.get_functions().count(func))
 		throw InvalidParameterValue("Invalid function");
-	if(func<5)
-		layout.get_driver().set_loco_function(address, func, state);
-	else
-		layout.get_driver().set_loco_function(address+1, func-4, state);
+	layout.get_driver().set_loco_function(address, func, state);
 }
 
 float Train::get_control(const string &ctrl) const
@@ -446,8 +443,7 @@ void Train::unplace()
 
 bool Train::free_block(Block &block)
 {
-	float margin = 10*layout.get_catalogue().get_scale();
-	if(get_reserved_distance_until(&block, false)<controller->get_braking_distance()*1.3+margin)
+	if(get_reserved_distance_until(&block, false)<controller->get_braking_distance()*1.3)
 		return false;
 
 	unsigned nsens = 0;
@@ -537,7 +533,15 @@ int Train::get_entry_to_block(Block &block) const
 
 float Train::get_reserved_distance() const
 {
-	return get_reserved_distance_until(0, false);
+	if(blocks.empty())
+		return 0;
+
+	float margin = 0;
+	TrackIter next = blocks.back().next().track_iter();
+	if(next && next->get_type().is_turnout())
+		margin = 15*layout.get_catalogue().get_scale();
+
+	return max(get_reserved_distance_until(0, false)-margin, 0.0f);
 }
 
 void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
@@ -678,11 +682,13 @@ void Train::control_changed(const Controller::Control &ctrl)
 	signal_control_changed.emit(ctrl.name, ctrl.value);
 }
 
-void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
+void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev)
 {
 	if(addr==address)
 	{
 		current_speed_step = speed;
+		if(rev!=reverse)
+			layout.get_driver().set_loco_reverse(address, reverse);
 		speed_changing = false;
 		pure_speed = false;
 	}
@@ -690,10 +696,8 @@ void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
 
 void Train::loco_func_event(unsigned addr, unsigned func, bool state)
 {
-	if(addr==address || (addr==address+1 && loco_type.get_max_function()>4))
+	if(addr==address)
 	{
-		if(addr==address+1)
-			func += 4;
 		if(state)
 			functions |= 1<<func;
 		else
@@ -778,6 +782,8 @@ void Train::sensor_event(unsigned addr, bool state)
 			}
 
 			// Move blocks up to the next sensor to our current blocks
+			for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
+				signal_advanced.emit(**j);
 			cur_blocks_end = end;
 
 			// Try to get more blocks if we're moving
@@ -877,7 +883,10 @@ void Train::reserve_more()
 		if(!block || block->get_endpoints().size()<2)
 		{
 			if(!blocking_train)
+			{
 				good_end = blocks.end();
+				end_of_route = true;
+			}
 			break;
 		}
 
@@ -981,7 +990,7 @@ void Train::reserve_more()
 				contested_blocks.push_back(block);
 				continue;
 			}
-			else if(divert_track && (entry_conflict || exit_conflict))
+			else if(divert_track && (entry_conflict || exit_conflict || !other_train->is_active()))
 				// We are blocked, but there's a diversion possibility
 				try_divert = true;
 
@@ -1180,10 +1189,10 @@ unsigned Train::find_speed_step(float real) const
 		if(real_speed[i].weight)
 		{
 			last = i;
-			if(real_speed[i].speed<real)
-				low = i;
-			else
+			if(real_speed[i].speed>=real)
 				high = i;
+			else if(real_speed[i].speed>real_speed[low].speed)
+				low = i;
 		}
 	if(!high)
 	{
@@ -1294,7 +1303,7 @@ bool Train::is_valid_diversion(const Route &diversion, const TrackIter &from)
 
 		track1 = track1.next(path);
 
-		if(track1.looped())
+		if(!track1 || track1.looped())
 			return false;
 	}
 
@@ -1312,6 +1321,8 @@ bool Train::is_valid_diversion(const Route &diversion, const TrackIter &from)
 		bool ok = (track2!=from && diversion.has_track(*track2));
 
 		track2 = track2.next(path);
+		if(!track2)
+			return false;
 
 		if(ok)
 			break;