Cosmetic fixes

[r2c2.git] / source / libr2c2 / timetable.cpp

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index 93f61c50608d0b56839bf6ba59af8ba6b4410c47..2fadcd54b4f55d210b7c3bee6eab58a382f2f4e0 100644 (file)
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -16,7 +16,8 @@ namespace R2C2 {
 Timetable::Timetable(Train &t):
        TrainAI(t),
        current_row(rows.end()),
-       update_pending(false)
+       update_pending(false),
+       sync_to_clock(true)
 {
        if(!train.get_ai_of_type<AIControl>())
                new AIControl(train);
@@ -115,7 +116,7 @@ void Timetable::save(list<DataFile::Statement> &st) const
        }
 }
 
-void Timetable::check_update(list<Row>::const_iterator i)
+void Timetable::check_update(const list<Row>::const_iterator &i)
 {
        for(list<Row>::const_iterator j=current_row; (j!=rows.end() && j!=i); ++j)
                if(j->type==ARRIVE)
@@ -144,6 +145,20 @@ void Timetable::update_route()
        if(rows.empty())
                return;
 
+       const Clock &clock = train.get_layout().get_clock();
+
+       if(sync_to_clock)
+       {
+               sync_to_clock = false;
+               current_row = rows.begin();
+               for(list<Row>::iterator i=rows.begin(); i!=rows.end(); ++i)
+                       if(i->type==DEPART && i->time>=clock.get_current_time())
+                       {
+                               current_row = i;
+                               break;
+                       }
+       }
+
        list<Row>::iterator arrive;
        list<Row>::iterator depart = find_trip(current_row, &arrive);
        if(depart==rows.end())
@@ -158,8 +173,6 @@ void Timetable::update_route()
 
        train.ai_message(Message("clear-route"));
 
-       const Clock &clock = train.get_layout().get_clock();
-
        current_row = depart;
        for(list<Row>::const_iterator i=depart; i!=rows.end(); ++i)
        {
@@ -173,8 +186,7 @@ void Timetable::update_route()
                        Time::TimeDelta dt = i->time-clock.get_current_time();
                        while(dt<Time::zero)
                                dt += Time::day;
-                       dt /= clock.get_rate();
-                       train.ai_message(Message("set-departure-delay", dt));
+                       train.ai_message(Message("set-departure-delay", dt/clock.get_rate()));
                }
                else if(i->type==THROUGH)
                        train.ai_message(Message("add-waypoint", i->target));