-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include "catalogue.h"
#include "layout.h"
#include "train.h"
using namespace Msp;
-#include <msp/io/print.h>
-
namespace R2C2 {
TrainStatus::TrainStatus(Train &t):
check();
}
-void TrainStatus::tick(const Time::TimeStamp &, const Time::TimeDelta &)
+void TrainStatus::tick(const Time::TimeDelta &)
{
check();
}
{
float scale = train.get_layout().get_catalogue().get_scale();
int s = static_cast<int>(train.get_quantized_speed()*3.6/scale+0.5);
- if(s==0 && train.is_active())
+ if(s==0 && train.get_block_allocator().is_active())
s = -1;
if(s!=speed)
}
else if(s==-1)
status = "Waiting";
- else if(!train.get_vehicle(0).get_track())
+ else if(!train.get_vehicle(0).is_placed())
status = "Unplaced";
else
status = "Stopped";