X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftrain.cpp;h=9cb032ec3f4a9a5663eece64a3048b76a103c10e;hb=0443ca05cbd306487131f5f5bd3b91181ae4a733;hp=4f6c2046d7d9e0528158bc5d5c6af560816e3cd0;hpb=ab64a17394440c3cb18d0b30d75fb4ed6297a6b4;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 4f6c204..9cb032e 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -6,6 +6,7 @@
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "aicontrol.h"
+#include "beamgate.h"
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
@@ -193,6 +194,7 @@ void Train::place(const BlockIter &block)
 
 	allocator.start_from(block);
 	accurate_position = false;
+	last_entry_block = BlockIter();
 
 	if(reverse)
 		vehicles.front()->place(block.reverse().track_iter(), 0, Vehicle::FRONT_BUFFER);
@@ -207,6 +209,7 @@ void Train::unplace()
 
 	allocator.clear();
 	accurate_position = false;
+	last_entry_block = BlockIter();
 
 	for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
 		(*i)->unplace();
@@ -309,6 +312,7 @@ void Train::tick(const Time::TimeDelta &dt)
 		driver.set_loco_reverse(address, r);
 
 		allocator.reverse();
+		last_entry_block = BlockIter();
 	}
 
 	if(speed_quantizer)
@@ -422,27 +426,28 @@ void Train::loco_func_event(unsigned addr, unsigned func, bool state)
 
 void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 {
-	Block *block = 0;
-	if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
-		block = &tc->get_block();
-	else
+	if(!current_speed_step || state!=Sensor::MAYBE_ACTIVE)
+		return;
+
+	Block *block = sensor.get_block();
+	if(!block || block->get_train()!=this)
 		return;
 
-	if(block->get_train()==this && state==Sensor::MAYBE_ACTIVE)
+	if(last_entry_block && &*last_entry_block!=block)
+	{
+		for(BlockIter i=last_entry_block.next(); (i && &*i!=block); i=i.next())
+			if(i->get_train()!=this || i->get_sensor_id())
+				return;
+	}
+
+	if(dynamic_cast<TrackCircuit *>(&sensor))
 	{
-		if(last_entry_block)
+		if(last_entry_block && pure_speed && speed_quantizer)
 		{
-			float travel_distance = -1;
-			if(pure_speed && speed_quantizer && current_speed_step>0)
-				travel_distance = 0;
+			float travel_distance = 0;
 
 			for(BlockIter i=last_entry_block; &*i!=block; i=i.next())
-			{
-				if(i->get_sensor_id())
-					return;
-				if(travel_distance>=0)
-					travel_distance += i->get_path_length(i.entry());
-			}
+				travel_distance += i->get_path_length(i.entry());
 
 			if(travel_distance>0)
 			{
@@ -471,6 +476,25 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 				vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE);
 		}
 	}
+	else if(BeamGate *gate = dynamic_cast<BeamGate *>(&sensor))
+	{
+		if(!advancing && vehicles.front()->get_track())
+		{
+			TrackIter track = allocator.iter_for(*block).track_iter();
+			for(; (track && &track->get_block()==block); track=track.next())
+				if(track.track()==gate->get_track())
+				{
+					if(reverse)
+						track = track.reverse();
+					float offset = gate->get_offset_from_endpoint(track.entry());
+					if(reverse)
+						vehicles.back()->place(track, offset, Vehicle::BACK_BUFFER);
+					else
+						vehicles.front()->place(track, offset, Vehicle::FRONT_BUFFER);
+					break;
+				}
+		}
+	}
 }
 
 void Train::halt_event(bool h)
@@ -486,12 +510,11 @@ float Train::get_reserved_distance_until(const Block *until_block) const
 
 	Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
 
-	TrackIter track = veh.get_track_iter();
+	TrackIter track = veh.get_track_iter().track_iter();
 	if(!track)  // XXX Probably unnecessary
 		return 0;
 
-	BlockIter block = track.block_iter();
-	if(&*block==until_block)
+	if(&track->get_block()==until_block)
 		return 0;
 
 	// Account for the vehicle's offset on its current track
@@ -502,6 +525,8 @@ float Train::get_reserved_distance_until(const Block *until_block) const
 		result = track->get_type().get_path_length(track->get_active_path())-result;
 	result -= veh.get_type().get_length()/2;
 
+	BlockIter block = track.block_iter();
+
 	// Count remaining distance in the vehicle's current block
 	for(track=track.next(); &track->get_block()==&*block; track=track.next())
 		result += track->get_type().get_path_length(track->get_active_path());