namespace R2C2 {
Timetable::Timetable(Train &t):
- train(t),
+ TrainAI(t),
enabled(false),
current_row(0),
executing(true),
return rows[i];
}
-void Timetable::tick(const Time::TimeStamp &t)
+void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
{
if(rows.empty() || !enabled)
return;
break;
case SPEED:
if(!arrived)
- train.set_control("speed", row.get_param<unsigned>(0)/3.6*train.get_layout().get_catalogue().get_scale());
+ {
+ float speed = row.get_param<unsigned>(0)/3.6*train.get_layout().get_catalogue().get_scale();
+ train.ai_message(Message("set-target-speed", speed));
+ }
break;
case REVERSE:
- train.set_control("reverse", !train.get_control("reverse"));
+ train.ai_message(Message("toggle-reverse"));
break;
case ROUTE:
if(!train.set_route(&train.get_layout().get_route(row.get_param<string>(0))))
void Timetable::save(list<DataFile::Statement> &st) const
{
+ if(!tag.empty())
+ st.push_back((DataFile::Statement("tag"), tag));
for(vector<Row>::const_iterator i=rows.begin(); i!=rows.end(); ++i)
st.push_back(i->save());
}
switch(type)
{
case GOTO_SENSOR:
- return "set route to sensor "+get_param<unsigned>(0);
+ return format("set route to sensor %d", get_param<unsigned>(0));
case GOTO_ZONE:
return "set route to "+get_param<string>(0);
case TRAVEL_TO:
add("route", &Loader::route);
add("speed", &Loader::speed);
add("reverse", &Loader::reverse);
+ add("tag", &Loader::tag);
add("travel_to", &Loader::travel_to);
add("travel_past", &Loader::travel_past);
add("wait", &Loader::wait);
obj.rows.push_back(Row(SPEED, s));
}
+void Timetable::Loader::tag(const string &t)
+{
+ obj.tag = t;
+}
+
void Timetable::Loader::travel_to(unsigned s)
{
obj.rows.push_back(Row(TRAVEL_TO, s));