Separate train routing logic to a class derived from TrainAI

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

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index 9fd44df6d80a480b6d9eb95e9a3cec1cc82e6550..d5a09517ef045c830a0903cdb96efa4fa2be6a23 100644 (file)
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -22,7 +22,7 @@ Timetable::Timetable(Train &t):
        arrived(false)
 {
        train.signal_advanced.connect(sigc::mem_fun(this, &Timetable::train_advanced));
-       train.signal_arrived.connect(sigc::mem_fun(this, &Timetable::train_arrived));
+       train.signal_ai_event.connect(sigc::mem_fun(this, &Timetable::event));
        Layout &layout = train.get_layout();
        layout.signal_block_state_changed.connect(sigc::mem_fun(this, &Timetable::block_state_changed));
        layout.signal_block_reserved.connect(sigc::mem_fun(this, &Timetable::block_reserved));
@@ -88,13 +88,11 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
                {
                case GOTO_SENSOR:
                        arrived = false;
-                       if(!train.go_to(get_sensor(row.get_param<unsigned>(0))))
-                               set_enabled(false);
+                       train.ai_message(Message("go-to-track", &get_sensor(row.get_param<unsigned>(0))));
                        break;
                case GOTO_ZONE:
                        arrived = false;
-                       if(!train.go_to(get_zone(row.get_param<string>(0))))
-                               set_enabled(false);
+                       train.ai_message(Message("go-to-zone", &get_zone(row.get_param<string>(0))));
                        break;
                case TRAVEL_TO:
                        {
@@ -153,8 +151,7 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
                        train.ai_message(Message("toggle-reverse"));
                        break;
                case ROUTE:
-                       if(!train.set_route(&train.get_layout().get_route(row.get_param<string>(0))))
-                               set_enabled(false);
+                       train.ai_message(Message("set-route", &train.get_layout().get_route(row.get_param<string>(0))));
                        break;
                }
 
@@ -232,19 +229,22 @@ void Timetable::train_advanced(Block &block)
                pending_train = 0;
 }
 
-void Timetable::train_arrived()
+void Timetable::event(TrainAI &, const Message &ev)
 {
-       if(rows.empty() || !enabled)
-               return;
-
-       Row &row = rows[current_row];
-       if(row.type==ARRIVE)
+       if(ev.type=="arrived")
        {
-               current_row = (current_row+1)%rows.size();
-               executing = true;
+               if(rows.empty() || !enabled)
+                       return;
+
+               Row &row = rows[current_row];
+               if(row.type==ARRIVE)
+               {
+                       current_row = (current_row+1)%rows.size();
+                       executing = true;
+               }
+               else
+                       arrived = true;
        }
-       else
-               arrived = true;
 }