#include <msp/core/refptr.h>
#include <msp/datafile/parser.h>
#include <msp/datafile/writer.h>
+#include <msp/io/print.h>
#include <msp/time/utils.h>
#include "block.h"
#include "catalogue.h"
#include "driver.h"
#include "layout.h"
-#include "locotype.h"
#include "route.h"
#include "track.h"
#include "tracktype.h"
#include "train.h"
+#include "vehicletype.h"
using namespace std;
using namespace Msp;
{
if(driver)
driver->halt(true);
+ IO::print("Emergency: %s\n", msg);
signal_emergency.emit(msg);
}
for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
{
+ if(i->second->is_temporary())
+ continue;
+
DataFile::Statement st("route");
st.append(i->first);
i->second->save(st.sub);
{
for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
{
+ if(i->second->is_temporary())
+ continue;
+
/* We must copy the turnout map, since adding tracks to the route will
(temporarily) mess it up */
const map<unsigned, int> turnouts = i->second->get_turnouts();
while(1)
{
// Traverse the track and get the next one
+ if(track->get_type().get_endpoints().size()<2)
+ break;
unsigned out_ep = track->traverse(ep, trk_path);
Track *next = track->get_links()[out_ep];
if(!next || next == start)
if((*i)->get_sensor_id()==addr)
{
if(!(*i)->get_train())
- emergency("Unreserved sensor triggered");
+ emergency(format("Unreserved sensor %d triggered", addr));
break;
}
}
void Layout::Loader::train(unsigned art_nr, unsigned addr)
{
- Train *trn = new Train(obj, obj.catalogue.get_locomotive(art_nr), addr);
+ Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr);
load_sub(*trn);
}