Train::Train(TrafficManager &tm, Locomotive &l):
trfc_mgr(tm),
loco(l),
+ pending_block(0),
target_speed(0),
+ route(0),
status("Unplaced"),
travel_dist(0),
travel_speed(0),
void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
{
if(try_reserve && t>try_reserve)
- {
reserve_more();
- update_speed();
- }
if(cur_track)
{
for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
i->entry = i->block->traverse(i->entry);
reserve_more();
- update_speed();
if(cur_track)
{
if(i->block->get_sensor_id()==addr)
set_position(i->block->get_endpoints()[i->entry]);
- if(target_speed)
- {
- reserve_more();
+ if(target_speed && reserve_more()<2)
update_speed();
- }
}
else
{
break;
}
- if(target_speed)
+ if(target_speed && pending_block && addr==pending_block->get_sensor_id())
reserve_more();
}
}
i = rsv_blocks.erase(i);
}
reserve_more();
- update_speed();
return;
}
+
+ if(pending_block && tid==pending_block->get_turnout_id())
+ reserve_more();
}
unsigned Train::reserve_more()
if(!last)
return 0;
+ pending_block = 0;
+
unsigned nsens = 0;
for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
if(i->block->get_sensor_id())
++nsens;
- bool result = false;
- while(nsens<2)
+ bool got_more = false;
+ while(nsens<3)
{
int exit = last->block->traverse(last->entry);
- if(exit>=0)
+ if(exit<0)
+ break;
+
+ Block *link = last->block->get_link(exit);
+ if(!link || !link->reserve(this))
+ {
+ pending_block = link;
+ break;
+ }
+
+ if(route && link->get_turnout_id())
{
- Block *link = last->block->get_link(exit);
- if(link && link->reserve(this))
+ int path = route->get_turnout(link->get_turnout_id());
+ Turnout &turnout = trfc_mgr.get_control().get_turnout(link->get_turnout_id());
+ if(path>=0 && path!=turnout.get_path())
{
- if(route && link->get_turnout_id())
- {
- int path = route->get_turnout(link->get_turnout_id());
- if(path>=0)
- trfc_mgr.get_control().get_turnout(link->get_turnout_id()).set_path(path);
- }
- rsv_blocks.push_back(BlockRef(link, link->get_endpoint_by_link(*last->block)));
- last = &rsv_blocks.back();
- if(last->block->get_sensor_id())
- {
- ++nsens;
- result = true;
- }
- }
- else
+ link->reserve(0);
+ pending_block = link;
+ turnout.set_path(path);
break;
+ }
+ }
+
+ rsv_blocks.push_back(BlockRef(link, link->get_endpoint_by_link(*last->block)));
+ last = &rsv_blocks.back();
+ if(last->block->get_sensor_id())
+ {
+ ++nsens;
+ got_more = true;
}
- else
- break;
}
- while(last && !last->block->get_sensor_id())
+ while(!rsv_blocks.empty() && !last->block->get_sensor_id())
{
last->block->reserve(0);
rsv_blocks.erase(--rsv_blocks.end());
last = 0;
}
+ if(got_more)
+ update_speed();
+
return nsens;
}