Allow zones with no qualifier or no number

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

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index 2fadcd54b4f55d210b7c3bee6eab58a382f2f4e0..5fa36395825d0afdb6dfb92df83e76f97d3cd6cb 100644 (file)
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -176,20 +176,19 @@ void Timetable::update_route()
        current_row = depart;
        for(list<Row>::const_iterator i=depart; i!=rows.end(); ++i)
        {
-               if(i->type==ARRIVE)
-               {
-                       train.ai_message(Message("set-destination", i->target));
-                       break;
-               }
-               else if(i->type==DEPART)
+               if(i->type==DEPART)
                {
                        Time::TimeDelta dt = i->time-clock.get_current_time();
                        while(dt<Time::zero)
                                dt += Time::day;
                        train.ai_message(Message("set-departure-delay", dt/clock.get_rate()));
                }
-               else if(i->type==THROUGH)
-                       train.ai_message(Message("add-waypoint", i->target));
+               else
+               {
+                       train.ai_message(Message("add-waypoint", TrainRouter::Waypoint(*i->target, i->direction)));
+                       if(i->type==ARRIVE)
+                               break;
+               }
        }
 
        list<Row>::iterator next_depart = find_trip(arrive, 0);
@@ -233,7 +232,8 @@ void Timetable::record_time()
 
 Timetable::Row::Row():
        type(ARRIVE),
-       target(0)
+       target(0),
+       direction(TrackChain::UNSPECIFIED)
 { }
 
 void Timetable::Row::save(list<DataFile::Statement> &st) const
@@ -241,6 +241,8 @@ void Timetable::Row::save(list<DataFile::Statement> &st) const
        st.push_back((DataFile::Statement("type"), type));
        st.push_back((DataFile::Statement("time"), time.raw()));
        st.push_back(target->save_reference());
+       if(direction)
+               st.push_back((DataFile::Statement("direction"), direction));
 }
 
 
@@ -265,9 +267,11 @@ Timetable::Row::Loader::Loader(Row &r, Layout &l):
        layout(l)
 {
        add("block", &Loader::block);
+       add("direction", &Row::direction);
        add("time", &Loader::time);
        add("type", &Row::type);
        add("zone", &Loader::zone);
+       add("zone", &Loader::zone_numbered);
 }
 
 void Timetable::Row::Loader::block(unsigned id)
@@ -280,7 +284,12 @@ void Timetable::Row::Loader::time(Time::RawTime t)
        obj.time = Time::TimeDelta(t);
 }
 
-void Timetable::Row::Loader::zone(const string &name, unsigned number)
+void Timetable::Row::Loader::zone(const string &name)
+{
+       zone_numbered(name, 0);
+}
+
+void Timetable::Row::Loader::zone_numbered(const string &name, unsigned number)
 {
        obj.target = &layout.get_zone(name, number);
 }