X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=b7dc2470c4c1a98e98e5aae789c39e4130e1f31f;hb=dda1e6c8716b6ac70d63a3f6ff95474a8b8b7336;hp=aa6cc481855ff3655ad2e29ff7ad65bdc5db66d1;hpb=ca9d278f9472206ad9a01190dcef9f0eb1bcc274;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index aa6cc48..b7dc247 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -40,7 +40,6 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 	speed_changing(false),
 	reverse(false),
 	functions(0),
-	travel_dist(0),
 	pure_speed(false),
 	speed_quantizer(0),
 	accurate_position(false),
@@ -192,26 +191,22 @@ void Train::ai_message(const TrainAI::Message &msg)
 		(*i)->message(msg);
 }
 
-void Train::place(Block &block, unsigned entry)
+void Train::place(const BlockIter &block)
 {
+	if(!block)
+		throw invalid_argument("Train::place");
 	if(controller->get_speed())
 		throw logic_error("moving");
 
 	set_active(false);
 	accurate_position = false;
 
-	allocator.start_from(block, entry);
+	allocator.start_from(block);
 
 	if(reverse)
-	{
-		TrackIter track = BlockIter(&block, entry).reverse().track_iter();
-		vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_BUFFER);
-	}
+		vehicles.front()->place(block.reverse().track_iter(), 0, Vehicle::FRONT_BUFFER);
 	else
-	{
-		const Block::Endpoint &bep = block.get_endpoint(entry);
-		vehicles.back()->place(*bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
-	}
+		vehicles.back()->place(block.track_iter(), 0, Vehicle::BACK_BUFFER);
 }
 
 void Train::unplace()
@@ -259,7 +254,7 @@ void Train::free_noncritical_blocks()
 
 	Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
 
-	TrackIter track(veh.get_track(), veh.get_entry());
+	TrackIter track = veh.get_track_iter();
 	BlockIter block = allocator.first();
 	const BlockIter &last_cur = allocator.last_current();
 	const BlockIter &last = allocator.last();
@@ -374,20 +369,9 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 			set_active(true);
 
 		Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front());
-		Track *track = vehicle.get_track();
-
-		BlockIter first = allocator.first();
-		BlockIter last_current = allocator.last_current();
-		bool ok = false;
-		for(BlockIter i=first; !ok; i=i.next())
-		{
-			ok = i->has_track(*track);
-			if(i==last_current)
-				break;
-		}
 
 		float d = speed*(dt/Time::sec);
-		if(ok)
+		if(allocator.is_block_current(vehicle.get_track()->get_block()))
 		{
 			SetFlag setf(advancing);
 			vehicle.advance(reverse ? -d : d);
@@ -486,52 +470,47 @@ void Train::loco_func_event(unsigned addr, unsigned func, bool state)
 
 void Train::block_state_changed(Block &block, Block::State state)
 {
-	if(state==Block::MAYBE_ACTIVE)
+	if(block.get_train()==this && state==Block::MAYBE_ACTIVE)
 	{
-		const BlockIter &first = allocator.first();
-		const BlockIter &last_cur = allocator.last_current();
-		bool valid = false;
-		for(BlockIter i=first; !valid; i=i.next())
+		if(last_entry_block)
 		{
-			if(&*i==&block)
-				valid = true;
-			if(&*i==&*last_cur)
-				break;
-		}
+			float travel_distance = -1;
+			if(pure_speed && speed_quantizer && current_speed_step>0)
+				travel_distance = 0;
 
-		if(valid)
-		{
-			// Compute speed and update related state
-			float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
+			for(BlockIter i=last_entry_block; &*i!=█ i=i.next())
+			{
+				if(i->get_sensor_id())
+					return;
+				if(travel_distance>=0)
+					travel_distance += i->get_path_length(i.entry());
+			}
+
+			if(travel_distance>0)
+			{
+				float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
+
+				if(travel_time_secs>=2)
+					speed_quantizer->learn(current_speed_step, travel_distance/travel_time_secs, travel_time_secs);
+			}
+		}
 
-			if(pure_speed && speed_quantizer && current_speed_step>0 && travel_time_secs>=2)
-				speed_quantizer->learn(current_speed_step, travel_dist/travel_time_secs, travel_time_secs);
+		last_entry_block = allocator.iter_for(block);
+		last_entry_time = Time::now();
+		pure_speed = true;
+		accurate_position = true;
+		overshoot_dist = 0;
 
-			travel_dist = 0;
-			unsigned entry = allocator.get_entry_to_block(block);
-			for(BlockIter i(&block, entry);; i=i.next())
+		if(!advancing && vehicles.front()->get_track())
+		{
+			TrackIter track = last_entry_block.track_iter();
+			if(reverse)
 			{
-				travel_dist += i->get_path_length(i.entry());
-
-				if(&*i==&block && !advancing && vehicles.front()->get_track())
-				{
-					TrackIter track = i.track_iter();
-					if(reverse)
-					{
-						track = track.flip();
-						vehicles.back()->place(*track, track.entry(), 0, Vehicle::BACK_AXLE);
-					}
-					else
-						vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_AXLE);
-				}
-
-				if(i==last_cur)
-					break;
+				track = track.flip();
+				vehicles.back()->place(track, 0, Vehicle::BACK_AXLE);
 			}
-			last_entry_time = Time::now();
-			pure_speed = true;
-			accurate_position = true;
-			overshoot_dist = 0;
+			else
+				vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE);
 		}
 	}
 }
@@ -550,7 +529,7 @@ float Train::get_reserved_distance_until(const Block *until_block, bool back) co
 	Vehicle &veh = *(reverse!=back ? vehicles.back() : vehicles.front());
 	const VehicleType &vtype = veh.get_type();
 
-	TrackIter track(veh.get_track(), veh.get_entry());
+	TrackIter track = veh.get_track_iter();
 	if(!track)  // XXX Probably unnecessary
 		return 0;
 
@@ -626,7 +605,7 @@ void Train::Loader::finish()
 	{
 		TrackIter track = obj.allocator.first().track_iter();
 		float offset = 2*obj.layout.get_catalogue().get_scale();
-		obj.vehicles.back()->place(*track, track.entry(), offset, Vehicle::BACK_BUFFER);
+		obj.vehicles.back()->place(track, offset, Vehicle::BACK_BUFFER);
 	}
 }