Remove a queued block reservation if the block is released

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index fe21881a2e4ab46a5f7f1e3b6a6e48c75bf7c2af..bc149dff1f904a014a0518052dacb36818a62fe6 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -414,7 +414,7 @@ void Layout::remove_train(Train &t)
                signal_train_removed.emit(t);
 }
 
-void Layout::tick()
+void Layout::tick(float speed)
 {
        if(driver)
                driver->tick();
@@ -425,6 +425,15 @@ void Layout::tick()
                dt = t-last_tick;
        last_tick = t;
 
+       dt *= speed;
+       unsigned count = dt/(10*Time::msec)+1;
+       dt /= count;
+       while(count--)
+               step(dt);
+}
+
+void Layout::step(const Time::TimeDelta &dt)
+{
        if(!driver || !driver->is_halted())
                clock.tick(dt);
 
@@ -556,7 +565,19 @@ void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
 void Layout::block_reserved(Block &block, Train *train)
 {
        if(emitting_block_reserved)
+       {
+               if(!train)
+               {
+                       for(deque<BlockReservation>::iterator i=block_reserve_queue.end(); i!=block_reserve_queue.begin(); )
+                               if((--i)->block==&block)
+                               {
+                                       block_reserve_queue.erase(i);
+                                       return;
+                               }
+               }
+
                block_reserve_queue.push_back(BlockReservation(block, train));
+       }
        else
        {
                SetFlag setf(emitting_block_reserved);
@@ -565,7 +586,7 @@ void Layout::block_reserved(Block &block, Train *train)
                {
                        BlockReservation br = block_reserve_queue.front();
                        block_reserve_queue.pop_front();
-                       signal_block_reserved.emit(br.block, br.train);
+                       signal_block_reserved.emit(*br.block, br.train);
                }
        }
 }
@@ -625,7 +646,7 @@ void Layout::Storage<B>::del()
 
 
 Layout::BlockReservation::BlockReservation(Block &b, Train *t):
-       block(b),
+       block(&b),
        train(t)
 { }