X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=1c7d996c5773dac66228e21be3632c31e64620a7;hb=776b39dfb0896aa563a220bdbf0b044425629917;hp=b98b37e7ee1b2c9b41d6b4a0c41a7f545052f03b;hpb=29878263d8faf9b7e5845e8b1c3d52b139a255cf;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index b98b37e..1c7d996 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -1,3 +1,4 @@
+#include "catalogue.h"
 #include "layout.h"
 #include "route.h"
 #include "train.h"
@@ -55,6 +56,9 @@ bool TrainRoutePlanner::update_states(RoutingStep &step)
 	bool changes = false;
 	for(vector<TrainRoutingState>::iterator i=next.trains.begin(); i!=next.trains.end(); ++i)
 	{
+		if(i->state==ARRIVED)
+			continue;
+
 		TrainState old_state = i->state;
 		if(i->state==BLOCKED)
 			i->state = MOVING;
@@ -194,9 +198,14 @@ void TrainRoutePlanner::create_routes(RoutingStep &goal)
 
 TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
 	train(&t),
+	speed(train->get_maximum_speed()),
 	router(train->get_ai_of_type<TrainRouter>()),
 	route(0)
-{ }
+{
+	// If no maximum speed is specified, use a sensible default
+	if(!speed)
+		speed = 20*train->get_layout().get_catalogue().get_scale();
+}
 
 
 TrainRoutePlanner::OccupiedTrack::OccupiedTrack(Track &t, unsigned p, OccupiedTrack *n):
@@ -265,6 +274,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState
 	offset(other.offset),
 	back_offset(other.back_offset),
 	state(other.state),
+	delay(other.delay),
 	waypoint(other.waypoint)
 {
 	++occupied_tracks->refcount;
@@ -278,8 +288,7 @@ TrainRoutePlanner::TrainRoutingState::~TrainRoutingState()
 
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() const
 {
-	// TODO Consider the speed of the train
-	return (track->get_type().get_path_length(path)-offset)*Time::sec+delay;
+	return ((track->get_type().get_path_length(path)-offset)/info->speed)*Time::sec+delay;
 }
 
 bool TrainRoutePlanner::TrainRoutingState::is_occupied(Track &trk) const
@@ -347,10 +356,7 @@ void TrainRoutePlanner::RoutingStep::advance(const Time::TimeDelta &dt)
 			i->delay = Time::zero;
 		}
 		else if(i->state==MOVING)
-		{
-			float distance = dt/Time::sec;
-			i->advance(distance);
-		}
+			i->advance(i->info->speed*(dt/Time::sec));
 	}
 }