Remember discovered MFX locomotives across runs

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

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 8de191b70ef0ac6fcf5cae6e289d238e3038d35a..b5a5bef11f674f3301a36c1304558bc63b2bc8fa 100644 (file)
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -14,7 +14,7 @@ namespace R2C2 {
 TrainRouter::TrainRouter(Train &t):
        TrainAI(t),
        priority(0),
-       arriving(false),
+       arriving(0),
        dest_zone(0),
        dest_block(0),
        update_pending(false)
@@ -55,7 +55,7 @@ bool TrainRouter::set_route(const Route *r)
        if(r)
                routes.push_back(r);
        train.stop_at(0);
-       arriving = false;
+       arriving = 0;
 
        train.refresh_blocks_from(*fncb);
 
@@ -142,12 +142,14 @@ void TrainRouter::tick(const Time::TimeDelta &)
        if(update_pending)
                create_plans(train.get_layout());
 
-       if(arriving && !train.get_speed())
+       if(arriving==1 && !train.get_speed())
        {
                signal_arrived.emit();
                signal_event.emit(Message("arrived"));
-               set_route(0);
+               arriving = 2;
        }
+       else if(arriving==2 && !train.get_block_allocator().is_active())
+               set_route(0);
 }
 
 void TrainRouter::save(list<DataFile::Statement> &st) const
@@ -181,9 +183,9 @@ void TrainRouter::block_reserved(Block &block, Train *t)
        if(advance_route(route, block))
        {
                // Check if the block is a turnout and set it to proper path
-               if(unsigned tid = block.get_turnout_id())
+               if(unsigned taddr = block.get_turnout_address())
                {
-                       int path = (*route)->get_turnout(tid);
+                       int path = (*route)->get_turnout(taddr);
                        if(path>=0)
                                b_iter.track_iter()->set_active_path(path);
                }
@@ -223,7 +225,7 @@ void TrainRouter::train_advanced(Block &block)
        {
                b_iter = b_iter.next();
                if(b_iter && !is_on_route(*b_iter))
-                       arriving = true;
+                       arriving = 1;
        }
 }